mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Vivien Didelot <vivien.didelot@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Vivien Didelot <vivien.didelot@gmail.com>
Subject: [PATCH 1/2] ARM: zii-vf610-dev: fix boot from SD
Date: Mon, 21 Jan 2019 12:53:04 -0500	[thread overview]
Message-ID: <20190121175305.31674-1-vivien.didelot@gmail.com> (raw)

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@gmail.com>
---
 .../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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2019-01-21 17:53 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21 17:53 Vivien Didelot [this message]
2019-01-21 17:53 ` [PATCH 2/2] ARM: zii-vf610-dev: boot initrd " Vivien Didelot
2019-01-22  7:40 ` [PATCH 1/2] ARM: zii-vf610-dev: fix boot " Sascha Hauer
2019-01-22 17:07   ` Vivien Didelot
2019-01-22 17:20     ` Sascha Hauer
2019-01-23  0:48     ` Andrey Smirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190121175305.31674-1-vivien.didelot@gmail.com \
    --to=vivien.didelot@gmail.com \
    --cc=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox