u-boot/board
Maxime Ripard de86fc3859 sunxi: Remove the MMC index hack
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>
2017-10-03 19:12:06 +02:00
..
8dtech/eco5pk
abilis/tb100
advantech x86: kconfig: Let board select SPI flash 2017-08-01 20:17:02 +08:00
alphaproject/ap_sh4a_4a i2c: Drop use of CONFIG_I2C_HARD 2017-05-15 06:17:09 +02:00
altera arm: socfpga: Add board files for the Arria10 2017-05-18 11:33:19 +02:00
amarula/vyasa-rk3288 rk3288: vyasa: Add falcon mode support 2017-10-01 00:33:33 +02:00
amazon/kc1 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
amlogic/odroid-c2 env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr() 2017-08-16 08:30:44 -04:00
AndesTech nds32: board: Fix andestech adp-ae3xx.c make fail problem. 2017-09-21 10:30:21 +08:00
Arcturus/ucp1020 env: Rename some other getenv()-related functions 2017-08-16 08:31:11 -04:00
aries env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
aristainetos env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
armadeus spl: add hierarchical defaults for SPL_LDSCRIPT 2017-08-13 17:12:37 +02:00
armltd env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
aspeed/evb_ast2500 aspeed: Support for ast2500 Eval Board 2017-01-28 14:04:33 -05:00
astro/mcf5373l board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
atmark-techno/armadillo-800eva Revert "arm: Remove unregister MACH_TYPE_xxx uses" 2017-01-28 14:04:22 -05:00
atmel configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment 2017-09-14 16:02:48 -04:00
avionic-design mmc: move more driver config options to Kconfig 2017-01-11 19:40:15 +09:00
bachmann/ot1200 imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
barco imx: imx6: Move gpr_init() function to soc.c 2017-08-28 09:48:53 +02:00
Barix/ipam390 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
beckhoff/mx53cx9020 imx: reorganize IMX code as other SOCs 2017-07-12 10:17:44 +02:00
birdland/bav335x env: Rename getenv_hex(), getenv_yesno(), getenv_ulong() 2017-08-16 08:30:32 -04:00
bluegiga/apx4devkit env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
bluewater env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
bosch/shc env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
boundary/nitrogen6x env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
broadcom env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
buffalo/lsxl env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr() 2017-08-16 08:30:44 -04:00
BuR env: Rename getenv_hex(), getenv_yesno(), getenv_ulong() 2017-08-16 08:30:32 -04:00
BuS/eb_cpu5282 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
cadence/xtfpga env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
calao/usb_a9263 board: usb_a9263: Update to support DT and DM 2017-08-04 20:38:38 -04:00
CarMediaLab/flea3 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
cavium/thunderx dm: Use dm.h header when driver mode is used 2017-06-01 06:57:52 -06:00
ccv/xpress env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
cei/cei-tk1-som dm: power: Convert as3722 to driver model 2017-07-28 12:02:47 -06:00
chipspark/popmetal_rk3288 rockchip: board: popmetal: de-assert the host rst pin in board init 2017-01-11 20:21:20 -07:00
cirrus/edb93xx arm: Add explicit include of <asm/mach-types.h> 2017-06-05 11:02:36 -04:00
cloudengines/pogo_e02
cobra5272 board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
compal/paz00 mmc: move more driver config options to Kconfig 2017-01-11 19:40:15 +09:00
compulab imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
comtrend MIPS: add BMIPS Comtrend CT-5361 board 2017-05-31 14:49:55 +02:00
congatec Merge git://git.denx.de/u-boot-imx 2017-09-01 10:40:59 -04:00
coreboot x86: kconfig: Let board select SPI flash 2017-08-01 20:17:02 +08:00
corscience/tricorder mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMC 2017-05-15 18:28:23 +09:00
creative/xfi3 xfi3: correct function name 2015-11-12 17:38:08 +01:00
cssi env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
CZ.NIC/turris_omnia env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr() 2017-08-16 08:23:56 -04:00
d-link/dns325
davinci arm: da850-evm: Enable DM and device tree support for da850-evm 2017-09-29 10:52:21 -04:00
dbau1x00 board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
dfi x86: dfi-bt700: Select SERIAL_RX_BUFFER via Kconfig 2017-08-24 11:00:47 +08:00
ebv/socrates arm: socfpga: socrates: Adding handoff for SDRAM ctrlcfg.extratime1 2016-10-27 08:03:09 +02:00
efi x86: kconfig: Select ARCH_EARLY_INIT_R in the platform Kconfig 2017-08-01 20:17:02 +08:00
egnite/ethernut5 board: ethernut5: Update to support DT and DM 2017-08-04 20:38:37 -04:00
el/el6x imx: imx6: Move gpr_init() function to soc.c 2017-08-28 09:48:53 +02:00
embest/mx6boards imx: reorganize IMX code as other SOCs 2017-07-12 10:17:44 +02:00
emulation x86: qemu: Add a config for 64-bit U-Boot 2017-02-07 13:34:10 +08:00
engicam imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
esd env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
espt sh: add common dram_init() function for all boards 2016-12-02 21:32:51 -05:00
firefly/firefly-rk3288 rockchip: Add basic support for firefly-rk3288 2015-09-02 21:28:24 -06:00
freescale board/ls2080ardb: Update board env based on SoC 2017-09-22 12:49:14 -07:00
gateworks/gw_ventana imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
gdsys env: Rename some other getenv()-related functions 2017-08-16 08:31:11 -04:00
ge/bx50v3 board: ge: bx50v3: set eth0 MAC address 2017-09-20 15:34:59 +02:00
geekbuying/geekbox rockchip: correct the bank0 ram size 2017-07-11 12:13:45 +02:00
google x86: kconfig: Let board select SPI flash 2017-08-01 20:17:02 +08:00
grinn env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
gumstix env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr() 2017-08-16 08:30:44 -04:00
h2200 arm: Add explicit include of <asm/mach-types.h> 2017-06-05 11:02:36 -04:00
highbank env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
hisilicon ARM: hisilicon: hikey: Fix eMMC with latest ATF & U-Boot 2017-08-20 09:54:31 -04:00
htkw/mcx env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
huawei/hg556a MIPS: add BMIPS Huawei HG556a board 2017-05-10 16:16:09 +02:00
ids/ids8313 board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
imgtec boston: Setup memory ranges in FDT provided to Linux 2017-05-12 13:29:50 +02:00
imx31_phycore arm: Add explicit include of <asm/mach-types.h> 2017-06-05 11:02:36 -04:00
intel x86: Support Intel Cherry Hill board 2017-09-16 14:57:44 +08:00
inversepath/usbarmory treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
iomega/iconnect
is1 arm: socfpga: is1: Adding handoff for SDRAM ctrlcfg.extratime1 2016-10-27 08:03:10 +02:00
isee igep00x0: merge igep0020 and igep0030 defconfigs to igep00x0_defconfig 2017-08-26 14:56:12 -04:00
keymile env: Rename some other getenv()-related functions 2017-08-16 08:31:11 -04:00
kmc/kzm9g ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE 2016-08-17 10:25:34 +09:00
kosagi/novena imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
l+g/vinco gpio: at91_gpio: remove CPU_HAS_PIO3 macro 2017-04-13 14:44:50 -06:00
LaCie env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
lego/ev3 arm: Include asm/setup.h explictly 2017-06-05 11:02:37 -04:00
lg/sniper env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
liebherr/mccmon6 imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
logicpd ARM: omap3: am3517-evm: Add device tree and DM support 2017-09-29 14:07:54 -04:00
Marvell ARM: mvebu: set correct mem_size for db-88f6820-amc 2017-08-21 11:40:49 +02:00
maxbcm arm: mvebu: Consolidate board Kconfig options into one file 2016-01-14 14:08:59 +01:00
microchip/pic32mzda clk: convert API to match reset/mailbox style 2016-06-19 17:05:55 -06:00
micronas/vct env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
mini-box/picosam9g45 arm: Add explicit include of <asm/mach-types.h> 2017-06-05 11:02:36 -04:00
mpc8308_p1m board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
mpr2 sh: add common dram_init() function for all boards 2016-12-02 21:32:51 -05:00
mqmaker/miqi_rk3288 rockchip: Add support for MiQi rk3288 board 2017-04-04 20:01:57 -06:00
ms7720se sh: add common dram_init() function for all boards 2016-12-02 21:32:51 -05:00
ms7722se sh: add common dram_init() function for all boards 2016-12-02 21:32:51 -05:00
ms7750se sh: add common dram_init() function for all boards 2016-12-02 21:32:51 -05:00
netgear/cg3100d MIPS: add BMIPS Netgear CG3100D board 2017-05-31 14:49:55 +02:00
nokia/rx51 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
nvidia dm: power: Convert as3722 to driver model 2017-07-28 12:02:47 -06:00
olimex/mx23_olinuxino status_led: Kconfig migration 2017-01-21 15:12:33 -05:00
omicron/calimain Remove various unused interrupt related code 2017-04-06 20:42:18 -04:00
overo env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
pandora mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMC 2017-05-15 18:28:23 +09:00
pb1x00 board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
phytec rockchip: phycore: Read configuration EEPROM & set ethaddr in late init 2017-09-05 11:04:34 +02:00
ppcag/bg0900
qca MIPS: QCA AP143: remove debug_uart_init call 2017-05-10 16:16:09 +02:00
qemu-mips board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
qualcomm/dragonboard410c MAINTAINERS: board: qcom: db410c: Maintainer changed 2017-09-11 13:34:31 -04:00
quipos/cairo Merge branch 'master' of git://git.denx.de/u-boot-mmc 2017-05-16 08:10:50 -04:00
radxa rockchip: rk3188: Add Radxa Rock board 2017-04-04 20:01:57 -06:00
raidsonic/ib62x0
raspberrypi/rpi env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
renesas ARM: rmobile: Fix SD divider settings on Gen3 2017-09-07 20:04:40 -04:00
rockchip rockchip: rk3399: make spl_board_init board-specific 2017-10-01 00:33:34 +02:00
ronetix board: pm9261: Update to support DT and DM 2017-08-04 20:38:37 -04:00
sagem/f@st1704 MIPS: add BMIPS Sagem F@ST1704 board 2017-05-31 14:49:55 +02:00
samsung usb: gadget: Make g_dnl USB settings common 2017-10-03 19:12:05 +02:00
samtec env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
sandbox GPT: create block device for sandbox testing 2017-09-14 21:32:57 -04:00
sandisk/sansa_fuze_plus
sbc8349 board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
sbc8548 Use correct spelling of "U-Boot" 2016-02-06 12:00:59 +01:00
sbc8641d board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
schulercontrol/sc_sps_1
Seagate arm: Add explicit include of <asm/mach-types.h> 2017-06-05 11:02:36 -04:00
seco imx: reorganize IMX code as other SOCs 2017-07-12 10:17:44 +02:00
sfr/nb4_ser mips: bmips: add NeufBox 4 (Sercomm) board 2017-05-10 16:16:09 +02:00
shmin sh: add common dram_init() function for all boards 2016-12-02 21:32:51 -05:00
siemens usb: gadget: Make g_dnl USB settings common 2017-10-03 19:12:05 +02:00
silica/pengwyn env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr() 2017-08-16 08:30:44 -04:00
socrates env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
solidrun arm: mvebu: clearfog: document boot from UART 2017-09-26 06:53:26 +02:00
spear board/spear/common: move code to arch/arm/cpu/arm926ejs/spear/ 2017-08-26 14:56:10 -04:00
sr1500 arm: socfpga: sr1500: Adding handoff for SDRAM ctrlcfg.extratime1 2016-10-27 08:03:10 +02:00
st board: Add stm32h7 SoC, discovery and evaluation boards support 2017-09-22 07:40:03 -04:00
sunxi sunxi: Remove the MMC index hack 2017-10-03 19:12:06 +02:00
Synology env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
synopsys arc: Add support for HS Development Kit board 2017-06-29 19:34:10 +03:00
sysam m68k: add board stmark2, mcf5441x based 2017-08-18 01:26:52 +02:00
syteco/zmx25 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
tbs/tbs2910 imx: reorganize IMX code as other SOCs 2017-07-12 10:17:44 +02:00
tcl/sl50 env: Rename getenv_hex(), getenv_yesno(), getenv_ulong() 2017-08-16 08:30:32 -04:00
technexion pico-imx7d: Add "how to boot with NXP 4.1 Kernel" 2017-09-18 17:15:28 +02:00
technologic env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr() 2017-08-16 08:23:56 -04:00
teejet/mt_ventoux env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
terasic arm: socfpga: add cyclone5 based de10-nano board 2017-04-25 12:46:44 +02:00
theadorable arm: mvebu: Remove theadorable_defconfig 2017-09-26 06:51:37 +02:00
theobroma-systems rockchip: rk3399-puma: add boot-on regulator to override BIOS_DISABLE 2017-10-01 00:33:35 +02:00
ti ARM: DRA72x: Add support for detection of DRA71x SR 2.1 2017-09-12 18:02:29 -04:00
timll env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr() 2017-08-16 08:30:44 -04:00
topic/zynq arm: zynq: Add support for the topic-miamilite system-on-module 2017-06-20 16:42:13 +02:00
toradex toradex: imx6: Move g_dnl_bind_fixup() into common SPL code 2017-09-20 15:34:59 +02:00
tplink/wdr4300 MIPS: tl-wdr4300: remove debug_uart_init call 2017-05-10 16:16:09 +02:00
tqc env: Rename setenv() to env_set() 2017-08-16 08:22:18 -04:00
udoo imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
varisys env: Rename some other getenv()-related functions 2017-08-16 08:31:11 -04:00
ve8313 board_f: Rename initdram() to dram_init() 2017-04-13 09:40:57 -04:00
vscom/baltos env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
wandboard imx6: drop duplicated bss memset and board_init_r() call 2017-09-18 17:15:28 +02:00
warp imx: reorganize IMX code as other SOCs 2017-07-12 10:17:44 +02:00
warp7 imx: reorganize IMX code as other SOCs 2017-07-12 10:17:44 +02:00
woodburn treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
work-microwave/work_92105 env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
xes env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
xilinx env: Rename getenv/_f() to env_get() 2017-08-16 08:30:24 -04:00
zipitz2 arm: Add explicit include of <asm/mach-types.h> 2017-06-05 11:02:36 -04:00
zyxel/nsa310s arm: kirkwood: add ZyXEL NSA310S device 2015-11-29 22:16:14 +01:00