diff options
| author | Andreas Huber <andreas.huber@keymile.com> | 2013-01-21 03:55:20 +0000 | 
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2013-02-15 17:47:20 -0600 | 
| commit | dacc109c41f82fcce68bd77e531663b485708f7a (patch) | |
| tree | a81194f270d7f6a5a881d0d2f45024122a2301fa | |
| parent | 6515139bfb9bac1e1aab07bfcf86239206d277bf (diff) | |
| download | olio-uboot-2014.01-dacc109c41f82fcce68bd77e531663b485708f7a.tar.xz olio-uboot-2014.01-dacc109c41f82fcce68bd77e531663b485708f7a.zip | |
km/common: introduce $uimage variable
Replace the hardcoded string with a variable. If CONFIG_NAND_ECC_BCH is
set we use a specific name for the uImage (ecc_bch_uImage).
Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
| -rw-r--r-- | include/configs/km/keymile-common.h | 9 | 
1 files changed, 8 insertions, 1 deletions
| diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index f64748e34..ae8875924 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -148,6 +148,12 @@  	"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" +#else +#define CONFIG_KM_UIMAGE_NAME "uImage\0" +#endif +  /*   * boottargets   * - set 'subbootcmds' @@ -210,9 +216,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  /* |