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

[u-boot] / include / configs / km / keymile-common.h

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index f64748e349c0355c9d4a0147569ae72eeb5f863a..3b15c4e6910010197a6fa9c7952e47a8caa4b690 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -24,10 +24,6 @@
 #ifndef __CONFIG_KEYMILE_H
 #define __CONFIG_KEYMILE_H
 
-/* Do boardspecific init for all boards */
-#define CONFIG_BOARD_EARLY_INIT_R
-#define CONFIG_LAST_STAGE_INIT
-
 #define CONFIG_BOOTCOUNT_LIMIT
 
 /*
@@ -148,6 +144,14 @@
        "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
 #endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */
 
+#ifdef CONFIG_NAND_ECC_BCH
+#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
+#define CONFIG_KM_ECC_MODE    " eccmode=bch"
+#else
+#define CONFIG_KM_UIMAGE_NAME "uImage\0"
+#define CONFIG_KM_ECC_MODE
+#endif
+
 /*
  * boottargets
  * - set 'subbootcmds'
@@ -184,6 +188,7 @@
                ":${hostname}:${netdev}:off3"                           \
                " console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}"        \
                " mem=${kernelmem} init=${init}"                        \
+               CONFIG_KM_ECC_MODE                                      \
                " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
                " " CONFIG_KM_UBI_LINUX_MTD " "                         \
                CONFIG_KM_DEF_BOOT_ARGS_CPU                             \
@@ -210,9 +215,10 @@
  */
 #define CONFIG_KM_DEF_ENV_FLASH_BOOT                                   \
        "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0"           \
-       "cramfsloadkernel=cramfsload ${load_addr_r} uImage\0"           \
+       "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"        \
        "ubicopy=ubi read "__stringify(CONFIG_KM_CRAMFS_ADDR)           \
                        " bootfs${boot_bank}\0"                         \
+       "uimage=" CONFIG_KM_UIMAGE_NAME                                 \
        CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*