Commit 69c050a6715995e666b3ece028db6a8f75dc502c

Authored by Hans de Goede
1 parent bbff84b3b0

sunxi: Enable second sdcard slot found on some boards

Enable the second sdcard slot found on some boards. Note that we do not
set CONFIG_MMC_SUNXI_SLOT_EXTRA for the SPL, as having it there is not useful,

Except for on the Mele-M3 where the second sdcard is an eMMC, from which the
device can also boot, and there we want to have both in the SPL, so that
a single u-boot binary can both from both. So for the M3 we do prefix the
defconfig setting with the special "+S:" syntax so that it applies to the
SPL too.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

Showing 3 changed files with 8 additions and 0 deletions Side-by-side Diff

configs/A10s-OLinuXino-M_defconfig
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
3 3 CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
  4 +CONFIG_MMC_SUNXI_SLOT_EXTRA=1
  5 ++S:CONFIG_MMC0_CD_PIN="PG1"
  6 ++S:CONFIG_MMC1_CD_PIN="PG13"
4 7 +S:CONFIG_ARM=y
5 8 +S:CONFIG_TARGET_SUN5I=y
configs/A20-OLinuXino_MICRO_defconfig
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3 3 CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
  4 +CONFIG_MMC_SUNXI_SLOT_EXTRA=3
  5 ++S:CONFIG_MMC0_CD_PIN="PH1"
  6 ++S:CONFIG_MMC3_CD_PIN="PH11"
4 7 +S:CONFIG_ARM=y
5 8 +S:CONFIG_TARGET_SUN7I=y
configs/Mele_M3_defconfig
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="MELE_M3,AXP209_POWER,SUNXI_GMAC,USB_EHCI"
3 3 CONFIG_FDTFILE="sun7i-a20-m3.dtb"
  4 ++S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2
  5 ++S:CONFIG_MMC0_CD_PIN="PH1"
4 6 +S:CONFIG_ARM=y
5 7 +S:CONFIG_TARGET_SUN7I=y