diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-12 21:08:05 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-12 21:08:05 (GMT) |
| commit | ae37a0704a8a27e47471f541a68b88370cd14aa8 (patch) | |
| tree | e591e61ff80c3ea1961b37c96e3ad161c8a1f0af /include/configs/katmai.h | |
| parent | 18a056a18f6294a88c34105efcabf4c0638a946b (diff) | |
| parent | dc41b8bf3df2b2c3bd833f871d88ff5ef40a19f3 (diff) | |
| download | u-boot-ae37a0704a8a27e47471f541a68b88370cd14aa8.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'include/configs/katmai.h')
| -rw-r--r-- | include/configs/katmai.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 76e9a76..2a7ab8d 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -53,13 +53,6 @@ #define CONFIG_HOSTNAME katmai #include "amcc-common.h" -/* - * For booting 256K-paged Linux we should have 16MB of memory - * for Linux initial memory map - */ -#undef CONFIG_SYS_BOOTMAPSZ -#define CONFIG_SYS_BOOTMAPSZ (16 << 20) - #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #undef CONFIG_SHOW_BOOT_PROGRESS @@ -188,11 +181,10 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_AMCC_DEF_ENV \ CONFIG_AMCC_DEF_ENV_POWERPC \ - CONFIG_AMCC_DEF_ENV_PPC_OLD \ CONFIG_AMCC_DEF_ENV_NOR_UPD \ - "kernel_addr=fff10000\0" \ - "ramdisk_addr=fff20000\0" \ - "kozio=bootm ffc60000\0" \ + "kernel_addr=ff000000\0" \ + "fdt_addr=ff1e0000\0" \ + "ramdisk_addr=ff200000\0" \ "pciconfighost=1\0" \ "pcie_mode=RP:RP:RP\0" \ "" |