diff options
| author | Vivien Didelot <vivien.didelot@gmail.com> | 2019-01-23 10:16:19 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-24 08:36:23 +0100 |
| commit | a819314c9104ea0b984fbd2b1c11fa297007d816 (patch) | |
| tree | 17f1846d6a97b35644aefa111eeaf2ed70615bfb /arch | |
| parent | 7aff4a78365ac6c3c5e62e04e27e556276ea3773 (diff) | |
| download | barebox-a819314c9104ea0b984fbd2b1c11fa297007d816.tar.gz barebox-a819314c9104ea0b984fbd2b1c11fa297007d816.tar.xz | |
ARM: zii-vf610-dev: fix boot from SD
Since 5f99a8d40305 ("dts: VFxxx: Add aliases for ESDHC controllers"),
the SD card slot has a consistent name across all ZII Dev platforms,
including CFU1. They all use mmc1 instead of mci0 or mci1.
This allows us to completely drop the init scripts from the default
ZII VF610 Dev environment, and fix the boot/sd script.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
3 files changed, 6 insertions, 19 deletions
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 cf8eec363c..92dfae0abf 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,8 @@ #!/bin/sh -global.bootm.image=/mnt/sd/zImage -global.bootm.oftree=/mnt/sd/${global.bootm.oftree} +detect mmc1 + +path="/mnt/mmc1.0" + +global.bootm.image="${path}/zImage" +global.bootm.oftree="${path}/vf610-zii-${global.hostname}.dtb" 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 f44dab34e4..0000000000 --- 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 diff --git a/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/choose-dtb b/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/choose-dtb deleted file mode 100644 index 41a74c3a98..0000000000 --- a/arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/choose-dtb +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -global.bootm.oftree=vf610-zii-${global.hostname}.dtb - |