| Message ID | 1449952271-8354-3-git-send-email-merker@debian.org |
|---|---|
| State | Superseded |
| Delegated to: | Hans de Goede |
| Headers | show |
On Sat, Dec 12, 2015 at 09:31:11PM +0100, Karsten Merker wrote: > 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. Sorry, I have to self-NACK this patch - I have by mistake sent an incomplete version. I'll send the correct version later; need to catch a train now... Regards, Karsten
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 98a2c74..53ad6d2 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -418,6 +418,11 @@ 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) #endif @@ -447,6 +452,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) \
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> --- include/configs/sunxi-common.h | 6 ++++++ 1 file changed, 6 insertions(+)