VF610 Dev Rev B and VF610 Dev Rev C boot from SD card attached to
SDHCI1, and CFU1, SPU3 and SCU4 boot from eMMC attached to SDHCI2.
Since 5f99a8d40305 ("dts: VFxxx: Add aliases for ESDHC controllers"),
these devices were renamed from mci0 and mci1 to mmc1 and mmc2.
To fix this, completely drop the automount-sd script, probe mmcX from
the boot/sd script directly and use the mountpoint /mnt/mmcX.0 from
there. At the same time, make the sd variable non global.
Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxx>
---
.../zii-vf610-dev/defaultenv-zii-vf610-dev/boot/sd | 14 ++++++++++++--
.../defaultenv-zii-vf610-dev/init/automount-sd | 13 -------------
2 files changed, 12 insertions(+), 15 deletions(-)
delete mode 100644 arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/automount-sd
diff --git a/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/boot/sd b/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/boot/sd
index cf8eec363..1a6f9706b 100644
--- a/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/boot/sd
+++ b/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/boot/sd
@@ -1,4 +1,14 @@
#!/bin/sh
-global.bootm.image=/mnt/sd/zImage
-global.bootm.oftree=/mnt/sd/${global.bootm.oftree}
+if [ x${global.hostname} = xdev-rev-b -o x${global.hostname} = xdev-rev-c ]; then
+ sd=1
+else
+ sd=2
+fi
+
+mmc${sd}.probe=1
+
+path="/mnt/mmc${sd}.0"
+
+global.bootm.image="${path}/zImage"
+global.bootm.oftree="${path}/${global.bootm.oftree}"
diff --git a/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/automount-sd b/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/automount-sd
deleted file mode 100644
index f44dab34e..000000000
--- a/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/automount-sd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ x${global.hostname} = xdev-rev-b -o x${global.hostname} = xdev-rev-c ];
-then
- global sd=0
-else
- global sd=1
-fi
-
-mkdir -p /mnt/sd
-automount /mnt/sd 'mci${global.sd}.probe=1 && mount /dev/disk${global.sd}.0 /mnt/sd'
-
-exit 0
--
2.20.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
