Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / include / configs / katmai.h

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 58694cca4b1cbc5e6152e267b1332740d4c9ed53..3840267312d08f2960c4c991e13fcbec2a57d745 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -45,7 +45,6 @@
  */
 #define CONFIG_PHYS_64BIT
 #define        CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED  ((phys_size_t)2 << 30)
 
 /*
  * Include common defines/options for all AMCC eval boards
@@ -53,6 +52,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
 
@@ -123,7 +129,6 @@
 #define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address  */
 
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_SPD_BUS_NUM         0       /* The I2C bus for SPD          */
 
 #define IIC0_BOOTPROM_ADDR     0x50
@@ -189,6 +194,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