summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorFrancisco Munoz <francisco.munoz@freescale.com>2012-08-02 17:57:17 -0500
committerJustin Waters <justin.waters@timesys.com>2012-09-12 11:05:55 -0400
commitc55f3f7d6275aa6992da11a13a44105b433125c2 (patch)
treecb82e76388dc31b9eec5b65f9c35a2a183ebe676 /common
parent4e21e47a5d63058e78e31a88d95fd45f0bd846e5 (diff)
ENGR00180538-1 MFG download burn sd,spi, nand, nor failed.
Added two new board files for Solo and Quad which allow uboot to be booted from WEIM NOR. Also amended the word “weim-nor” in both mfg configuration files which allow to erase/write u-boot and uImage in Parallel nor using the mfg tool. Lastly just added a label in the regular board files indicating that another config file has to be used in the case of NOR boot. Modified files: Makefile common/env_common.c include/configs/mx6q_sabreauto.h include/configs/mx6q_sabreauto_boot_weimnor.h include/configs/mx6q_sabreauto_mfg_enable_weimnor.h include/configs/mx6solo_sabreauto.h include/configs/mx6solo_sabreauto_boot_weimnor.h include/configs/mx6solo_sabreauto_mfg_enable_weimnor.h Signed-off-by: Francisco Munoz <francisco.munoz@freescale.com>
Diffstat (limited to 'common')
-rw-r--r--common/env_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/env_common.c b/common/env_common.c
index 2f7fae6244c..03920068336 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -146,7 +146,8 @@ uchar default_environment[] = {
#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
|| defined(CONFIG_ENV_IS_IN_SPI_FLASH) \
- || defined(CONFIG_ENV_IS_IN_MMC)
+ || defined(CONFIG_ENV_IS_IN_MMC) \
+ || defined(CONFIG_ENV_IS_FLASH)
int default_environment_size = sizeof(default_environment);
#endif