summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2014-06-06 14:46:22 +0800
committerYe.Li <B37916@freescale.com>2014-06-17 11:13:45 +0800
commit2b476405a313ff2cf13466c01de09f94b60877c6 (patch)
tree5628a56ca764c6430990eeb24d52d5a15c70203f /include
parent2e1f3f5f555aa5c034e87a9a2c6d267a3282c632 (diff)
downloadu-boot-imx-2b476405a313ff2cf13466c01de09f94b60877c6.zip
u-boot-imx-2b476405a313ff2cf13466c01de09f94b60877c6.tar.gz
u-boot-imx-2b476405a313ff2cf13466c01de09f94b60877c6.tar.bz2
ENGR00315894-32 i.mx6:sabreauto/sabresd Set the mmcdev for various boot devices
For the SPI/WEIM NOR, it can't store all the images into it due to it's capacity, we need one default mmc device to load the left image or rootfs. The end user need change the default setting according to their needs. For NAND/SATA boot, the storage is big enough to hold all the stuff. For SD/MMC boot, mmcdev is dynamiclly created due to the boot SD/MMC slot. Signed-off-by: Jason Liu <r64343@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6sabre_common.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 225c332..4db8440 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -104,6 +104,19 @@
#define CONFIG_MFG_NAND_PARTITION ""
#endif
+/*
+ * For the SPI/WEIM NOR, it can't store all the images into it due to it's
+ * capacity, we need one default mmc device to load the left image or rootfs.
+ * The end user need change the default setting according to their needs.
+ * For NAND/SATA boot, the storage is big enough to hold all the stuff.
+ * For SD/MMC boot, mmcdev is dynamiclly created due to the boot SD/MMC slot.
+ */
+#if defined(CONFIG_SYS_BOOT_EIMNOR) || defined(CONFIG_SYS_BOOT_SPINOR)
+#define CONFIG_MMC_DEV_SET "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)
+#else
+#define CONFIG_MMC_DEV_SET " "
+#endif
+
#define CONFIG_MFG_ENV_SETTINGS \
"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \
"rdinit=/linuxrc " \
@@ -164,7 +177,8 @@
"console=" CONFIG_CONSOLE_DEV "\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ CONFIG_MMC_DEV_SET \
+ "\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"update_sd_firmware=" \