summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2024-04-03 11:06:02 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2024-04-03 14:26:13 +0200
commit8f1923ac8ff6cfedc3b4411fa232ea65b0c55769 (patch)
tree717b12953782d0c45cd4ead4d662c90999df20b4
parentfa6c38a55d8df23c97ff4b2cc6055c5796663dcf (diff)
downloadbarebox-8f1923ac8ff6.tar.gz
barebox-8f1923ac8ff6.tar.xz
ARM: rpi: detect mci1 as well when searching for environment
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@pengutronix.de> Link: https://lore.barebox.org/20240403090602.2978695-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/raspberry-pi/rpi-common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 7c82c740e2..924d4425bd 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);