summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKarsten Merker <merker@debian.org>2015-12-16 20:59:40 +0100
committerHans de Goede <hdegoede@redhat.com>2015-12-21 20:37:51 +0100
commit5a37a4007afb56955e247d2f0d5f830bc1623363 (patch)
treed774a2ca2b21b37ca62ed400fcb6f2303ec4968b /include
parent2ec62022edbe88a151b100274758f865a70d53bf (diff)
downloadblackbird-obmc-uboot-5a37a4007afb56955e247d2f0d5f830bc1623363.tar.gz
blackbird-obmc-uboot-5a37a4007afb56955e247d2f0d5f830bc1623363.zip
sunxi: Enable a second mmc socket as boot target in the environment
Some sunxi-based boards (such as the Olimex A20-SOM-EVB) have a second MMC socket. This socket is not bootable hardware-wise, i.e. u-boot itself cannot be loaded from it, but once u-boot has started, the second socket can be used in the boot process provided by config_distro_bootcmd.h. If a second MMC socket is present, place it in the boot order after the first MMC socket. Signed-off-by: Karsten Merker <merker@debian.org> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sunxi-common.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index da6ab61d1b..8042073c45 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -419,8 +419,14 @@ extern int soft_i2c_gpio_scl;
#ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
+#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
+#define BOOT_TARGET_DEVICES_MMC_EXTRA(func) func(MMC, mmc, 1)
+#else
+#define BOOT_TARGET_DEVICES_MMC_EXTRA(func)
+#endif
#else
#define BOOT_TARGET_DEVICES_MMC(func)
+#define BOOT_TARGET_DEVICES_MMC_EXTRA(func)
#endif
#ifdef CONFIG_AHCI
@@ -448,6 +454,7 @@ extern int soft_i2c_gpio_scl;
#define BOOT_TARGET_DEVICES(func) \
func(FEL, fel, na) \
BOOT_TARGET_DEVICES_MMC(func) \
+ BOOT_TARGET_DEVICES_MMC_EXTRA(func) \
BOOT_TARGET_DEVICES_SCSI(func) \
BOOT_TARGET_DEVICES_USB(func) \
func(PXE, pxe, na) \
OpenPOWER on IntegriCloud