summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-08-03 10:29:50 +0200
committerStefan Roese <sr@denx.de>2010-08-09 16:05:37 +0200
commitfc21cd552bf7845fd2002e7a090d53ee5d12d335 (patch)
treeaea10e235707e740e1f49ff40e3d260cc795420b
parent5bea7e6ce3837e12e507a78211bbf902ab43252a (diff)
downloadtalos-obmc-uboot-fc21cd552bf7845fd2002e7a090d53ee5d12d335.tar.gz
talos-obmc-uboot-fc21cd552bf7845fd2002e7a090d53ee5d12d335.zip
ppc4xx: Fix/Update katmai board header
This patch has the following fixes/changes: - Set 'kernel_addr' and 'ramdisk_addr' to correct values and add 'fdt_addr' environment variable - Remove 'kozio' environment variable - Remove environmant variables to boot ancient arch/ppc Linux kernels - Remove CONFIG_SYS_BOOTMAPSZ definition. It's already defined to the same value in amcc-common.h Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--include/configs/katmai.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 76e9a76264..2a7ab8de0e 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" \
""
OpenPOWER on IntegriCloud