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

[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 7ceb5e7eda4f0346306d34e0c5bca57ee48d37be..eb85a7491910b1038f941839ea2099974b0a9e9f 100644 (file)
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -2,7 +2,7 @@
  * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_KEYMILE_POWERPC_H
@@ -17,6 +17,9 @@
 #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
@@ -32,6 +35,9 @@
 
 #define CONFIG_SYS_LOAD_ADDR   0x100000        /* default load address */
 
+/* Reserve 4 MB for malloc */
+#define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
+
 /******************************************************************************
  * (PRAM usage)
  * ... -------------------------------------------------------
@@ -53,8 +59,9 @@
 #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 */
@@ -64,11 +71,6 @@
 #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} && "\
@@ -76,6 +78,7 @@
                "cp.b ${load_addr_r} " __stringify(BOOTFLASH_START)     \
                "  ${filesize} && "                                     \
                "protect on " __stringify(BOOTFLASH_START) "  +${filesize}\0"\
+       "set_fdthigh=true\0"                                            \
        ""
 
 #endif /* __CONFIG_KEYMILE_POWERPC_H */