summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYuri Tikhonov <yur@emcraft.com>2008-11-14 16:19:19 +0300
committerStefan Roese <sr@denx.de>2008-11-21 11:08:02 +0100
commit1a6a00dcc5bdfc6e9b4b00f39c1f583a7f96fc7f (patch)
tree753acad70f3c15d7be5d4fc1315fc5393a55e2c7 /include
parentddf45cc758d394591fb9bcdcbe96530f733f2bce (diff)
downloadblackbird-obmc-uboot-1a6a00dcc5bdfc6e9b4b00f39c1f583a7f96fc7f.tar.gz
blackbird-obmc-uboot-1a6a00dcc5bdfc6e9b4b00f39c1f583a7f96fc7f.zip
ppc4xx: katmai: Change default config
This patch enables support for EXT2, and increases the CONFIG_SYS_BOOTMAPSZ size for the default configuration of the katmai boards to use them as the RAID-reference AMCC setups. EXT2 enabling allows one to boot kernels from the EXT2 formatted Compact Flash cards. CONFIG_SYS_BOOTMAPSZ increasing allows one to boot the Linux kernels, which use PAGE_SIZE of 256KB. Otherwise, the memory area with DTB file (which is placed at the end of the bootmap area) will turn out to be overlapped with the BSS segment of the 256KB kernel, and zeroed in early_init() of Linux. Actually, increasing of the bootmap size could be done via setting of the bootm_size U-Boot variable, but it looks like the current U-Boot implementation have some bootm_size- related functionality lost. In many places through the U-Boot code the CONFIG_SYS_BOOTMAPSZ definition is used directly (instead of trying to read the corresponding value from the environment). The same is truth for the boot_jump_linux() function in lib_ppc/bootm.c, where U-Boot transfers control to Linux passing the CONFIG_SYS_BOOTMAPSZ (not bootm_size) value to the booting kernel. Signed-off-by: Yuri Tikhonov <yur@emcraft.com> Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/katmai.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 58694cca4b..ea6cf0d23f 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -53,6 +53,13 @@
#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
@@ -189,6 +196,7 @@
/*
* Commands additional to the ones defined in amcc-common.h
*/
+#define CONFIG_CMD_EXT2
#define CONFIG_CMD_DATE
#define CONFIG_CMD_PCI
#define CONFIG_CMD_SDRAM
OpenPOWER on IntegriCloud