km/common: rework and simplify default environment

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

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index f1eea2632007c5fb964cd63ea77201b2a1b3cd90..7eb5cd49f6baa9b2e08ceb60b978f732369e3ad0 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -67,12 +67,12 @@
 #define CONFIG_KM_CRAMFS_ADDR  0x2400000
 #define CONFIG_KM_KERNEL_ADDR  0x2000000       /* 4096KBytes */
 
+/* architecture specific default bootargs */
+#define CONFIG_KM_DEF_BOOT_ARGS_CPU                                    \
+               "bootcountaddr=${bootcountaddr} ${mtdparts}"
+
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "addbootcount="                                                 \
-               "setenv bootargs ${bootargs} "                          \
-               "bootcountaddr=${bootcountaddr}\0"                      \
-       "addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0"         \
-       "boot=bootm ${actual_kernel_addr} - -\0"                        \
+       "boot=bootm ${load_addr_r} - -\0"                               \
        "cramfsloadfdt=true\0"                                          \
        CONFIG_KM_DEF_ENV_UPDATE                                        \
        ""
@@ -229,7 +229,7 @@ int get_scl(void);
 #define        CONFIG_KM_DEF_ENV_UPDATE                                        \
        "update="                                                       \
                "spi on;sf probe 0;sf erase 0 50000;"                   \
-               "sf write ${u-boot_addr_r} 0 ${filesize};"              \
+               "sf write ${load_addr_r} 0 ${filesize};"                \
                "spi off\0"
 
 /*