km/common: rework and simplify default environment

[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 d6db8d79f1a51e6c3b79630d1a3f0b2571cabf8a..7aaa8d21e85c23e1259d488061e0b1c91151cadc 100644 (file)
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -66,19 +66,19 @@
 #define CONFIG_KM_KERNEL_ADDR  0x400000        /* 3968Kbytes */
 #define CONFIG_KM_FDT_ADDR     0x7E0000        /* 128Kbytes */
 
+/* architecture specific default bootargs */
+#define CONFIG_KM_DEF_BOOT_ARGS_CPU            ""
+
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "addbootcount=true\0"                                           \
-       "addmtdparts=true\0"                                            \
-       "boot=bootm ${actual_kernel_addr} - ${actual_fdt_addr}\0"       \
+       "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"                   \
        "cramfsloadfdt="                                                \
                "cramfsload ${fdt_addr_r} "                             \
-               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb && "           \
-               "setenv actual_fdt_addr ${fdt_addr_r}\0"                \
+               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
        "fdt_addr_r=" xstr(CONFIG_KM_FDT_ADDR) "\0"                     \
        "update="                                                       \
                "protect off " xstr(BOOTFLASH_START) " +${filesize} && "\
                "erase " xstr(BOOTFLASH_START) "  +${filesize} && "     \
-               "cp.b ${u-boot_addr_r} " xstr(BOOTFLASH_START)          \
+               "cp.b ${load_addr_r} " xstr(BOOTFLASH_START)            \
                "  ${filesize} && "                                     \
                "protect on " xstr(BOOTFLASH_START) "  +${filesize}\0"  \
        ""