Kconfig: Move CONFIG_FIT and related options to Kconfig

[people/ms/u-boot.git] / include / configs / km / km-powerpc.h

diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 15fef24db090440561dd195caa7d7ad043857ee1..8293607c9cb3586beaa5c5cef27b07e73e22ef6a 100644 (file)
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -17,8 +17,10 @@
 #define CONFIG_CMD_DTT
 #define CONFIG_JFFS2_CMDLINE
 
+/* standard km ethernet_present for piggy */
+#define CONFIG_KM_COMMON_ETH_INIT
+
 /* EEprom support 24C08, 24C16, 24C64 */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3  /* 8 Byte write page */
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
@@ -56,22 +58,18 @@
 #define CONFIG_KM_PHRAM                0x100000
 /* resereved pram area at the end of memroy [hex] */
 #define CONFIG_KM_RESERVED_PRAM        0x0
-/* enable protected RAM */
-#define CONFIG_PRAM            0
+/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
+ * is not valid yet, which is the case for when u-boot copies itself to RAM */
+#define CONFIG_PRAM            ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
-#define CONFIG_KM_CRAMFS_ADDR  0x800000
-#define CONFIG_KM_KERNEL_ADDR  0x400000        /* 3968Kbytes */
-#define CONFIG_KM_FDT_ADDR     0x7E0000        /* 128Kbytes */
+#define CONFIG_KM_CRAMFS_ADDR  0xC00000
+#define CONFIG_KM_KERNEL_ADDR  0x400000        /* 7680Kbytes */
+#define CONFIG_KM_FDT_ADDR     0xB80000        /* 512Kbytes */
 
 /* architecture specific default bootargs */
 #define CONFIG_KM_DEF_BOOT_ARGS_CPU            ""
 
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"                   \
-       "cramfsloadfdt="                                                \
-               "cramfsload ${fdt_addr_r} "                             \
-               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
-       "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0"              \
        "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.bin\0"           \
        "update="                                                       \
                "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
@@ -79,6 +77,8 @@
                "cp.b ${load_addr_r} " __stringify(BOOTFLASH_START)     \
                "  ${filesize} && "                                     \
                "protect on " __stringify(BOOTFLASH_START) "  +${filesize}\0"\
+       "set_fdthigh=true\0"                                            \
+       "checkfdt=true\0"                                               \
        ""
 
 #endif /* __CONFIG_KEYMILE_POWERPC_H */