mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-29 22:33:44 +09:00
de86fc3859
The current code, if there's both an eMMC and an MMC slot available on the board, will swap the MMC indices based on whether we booted from the eMMC or the MMC. This way, the MMC we're supposed to boot on will always have the index 0. However, this causes various issues, for example when using other components that base their behaviour on the MMC index, such as fastboot. Let's remove that hack, and take the opposite approach. The MMC will always have the same index, but the bootcmd will pick the same device than the one we booted from. This is done through the introduction of the mmc_bootdev environment variable that will be filled by the board code based on the boot device informations we can get from the SoC. In order to not introduce regressions, we also need to adjust the fastboot MMC device and the environment device in order to set it to the eMMC, over the MMC, like it used to be the case. Tested-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
25 lines
669 B
Plaintext
25 lines
669 B
Plaintext
CONFIG_ARM=y
|
|
CONFIG_ARCH_SUNXI=y
|
|
CONFIG_MACH_SUN8I_A33=y
|
|
CONFIG_DRAM_CLK=600
|
|
CONFIG_DRAM_ZQ=15291
|
|
CONFIG_MMC0_CD_PIN="PD14"
|
|
CONFIG_MMC2_PINS="PC"
|
|
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
|
|
CONFIG_USB0_ID_DET="PD10"
|
|
CONFIG_USB1_VBUS_PIN="PD12"
|
|
CONFIG_AXP_GPIO=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="sun8i-r16-parrot"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
CONFIG_SPL=y
|
|
CONFIG_FASTBOOT_FLASH=y
|
|
# CONFIG_CMD_IMLS is not set
|
|
# CONFIG_CMD_FLASH is not set
|
|
# CONFIG_CMD_FPGA is not set
|
|
# CONFIG_SPL_DOS_PARTITION is not set
|
|
# CONFIG_SPL_ISO_PARTITION is not set
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_MUSB_GADGET=y
|
|
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|