From: Karsten Merker Date: Wed, 16 Dec 2015 19:59:40 +0000 (+0100) Subject: sunxi: Enable a second mmc socket as boot target in the environment X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5a37a4007afb56955e247d2f0d5f830bc1623363;p=u-boot.git 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 Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede --- 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) \