env: Finish migration of common ENV options

[platform/kernel/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 7ceb5e7..8459487 100644 (file)
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -1,37 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #ifndef __CONFIG_KEYMILE_POWERPC_H
 #define __CONFIG_KEYMILE_POWERPC_H
 
 /* Do boardspecific init for all boards */
-#define CONFIG_BOARD_EARLY_INIT_R
-#define CONFIG_LAST_STAGE_INIT
 
-#define CONFIG_BOOTCOUNT_LIMIT
-
-#define CONFIG_CMD_DTT
 #define CONFIG_JFFS2_CMDLINE
 
 /* 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
 
-#define CONFIG_ENV_SIZE                0x04000         /* Size of Environment */
-#define CONFIG_FLASH_CFI_MTD
-
 #define CONFIG_SYS_MEMTEST_START 0x00100000    /* memtest works on */
 
 #define CONFIG_SYS_MEMTEST_END 0x00f00000      /* 1 ... 15 MB in DRAM  */
 
 #define CONFIG_SYS_LOAD_ADDR   0x100000        /* default load address */
 
+/* Reserve 4 MB for malloc */
+#define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
+
 /******************************************************************************
  * (PRAM usage)
  * ... -------------------------------------------------------
@@ -47,35 +40,23 @@
 
 /* size of rootfs in RAM */
 #define CONFIG_KM_ROOTFSSIZE   0x0
-/* pseudo-non volatile RAM [hex] */
-#define CONFIG_KM_PNVRAM       0x80000
-/* physical RAM MTD size [hex] */
-#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
-
-#define CONFIG_KM_CRAMFS_ADDR  0x800000
-#define CONFIG_KM_KERNEL_ADDR  0x400000        /* 3968Kbytes */
-#define CONFIG_KM_FDT_ADDR     0x7E0000        /* 128Kbytes */
+/* 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)
 
 /* 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"           \
+       "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0"                \
        "update="                                                       \
                "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
                "erase " __stringify(BOOTFLASH_START) "  +${filesize} && "\
                "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 */