[PATCH] ARM: rpi: detect mci1 as well when searching for environment

Ahmad Fatoum a.fatoum at pengutronix.de
Wed Apr 3 02:06:02 PDT 2024


On Raspberry Pi 4, which lacks aliases like other Raspberry Pis,
the SD-Card is named mci1, while mci0 is the SDIO card.

Therefore detect both mci0 and mci1 in hope that one of them will
provide disk0. This is safe to do as barebox will now gracefully
skip SDIO cards during probe.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 arch/arm/boards/raspberry-pi/rpi-common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 7c82c740e256..924d4425bd87 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -192,6 +192,7 @@ static int rpi_env_init(void)
 	int ret;
 
 	device_detect_by_name("mci0");
+	device_detect_by_name("mci1");
 
 	diskdev = "/dev/disk0.0";
 	ret = stat(diskdev, &s);
-- 
2.39.2




More information about the barebox mailing list