summaryrefslogtreecommitdiff
path: root/include/configs/km/keymile-common.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-02-18 09:57:06 -0500
committerTom Rini <trini@ti.com>2013-02-18 09:57:06 -0500
commit1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f (patch)
tree65493c2c97adc37be6a60fc0a2fb81d214257fb1 /include/configs/km/keymile-common.h
parentea6bd08b7717bf0d3f69ad9f016bf3b03b3eaf16 (diff)
parent411190cb16b63e39345a608b68b3d1be5168117a (diff)
downloadu-boot-imx-1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f.zip
u-boot-imx-1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f.tar.gz
u-boot-imx-1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'include/configs/km/keymile-common.h')
-rw-r--r--include/configs/km/keymile-common.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index f64748e..796f330 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -148,6 +148,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 +192,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 +219,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
/*