diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /doc/README.alaska8220 | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'doc/README.alaska8220')
| -rw-r--r-- | doc/README.alaska8220 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/README.alaska8220 b/doc/README.alaska8220 index 8e659f3dd..0bd68d962 100644 --- a/doc/README.alaska8220 +++ b/doc/README.alaska8220 @@ -87,12 +87,12 @@ Added files: 3.1 Explanation on NEW definitions in include/configs/alaska8220.h CONFIG_MPC8220 MPC8220 specific CONFIG_ALASKA8220 Alaska board specific - CFG_MPC8220_CLKIN Define Alaska Input Clock + CONFIG_SYS_MPC8220_CLKIN Define Alaska Input Clock CONFIG_PSC_CONSOLE Enable MPC8220 UART CONFIG_EXTUART_CONSOLE Enable External 16552 UART - CFG_AMD_BOOT To determine the u-boot is booted from AMD or Intel - CFG_MBAR MBAR base address - CFG_DEFAULT_MBAR Reset MBAR base address + CONFIG_SYS_AMD_BOOT To determine the u-boot is booted from AMD or Intel + CONFIG_SYS_MBAR MBAR base address + CONFIG_SYS_DEFAULT_MBAR Reset MBAR base address 3.2 Compilation export CROSS_COMPILE=cross-compile-prefix |