On Tue, Jan 22, 2019 at 9:07 AM Vivien Didelot <vivien.didelot@xxxxxxxxx> wrote:
>
> Hi Sascha,
>
> On Tue, 22 Jan 2019 08:40:03 +0100, Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:
> > On Mon, Jan 21, 2019 at 12:53:04PM -0500, Vivien Didelot wrote:
> > > 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>
> > > ---
> > > --- 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'
> >
> > Any special reason you evaluate $global.sd at the time the automount is
> > executed? I would expect a local variable here and the command put in
> > "" rather than ''
>
> I'm not sure to understand your question. As stated in the commit
> message, this patch gets rid of this automount script and use a local
> variable 'sd' in the boot/sd script instead.
>
> That said, please wait for Andrey to review and confirm that the SD
> card slot on CFU and other boards is mmc2, because I only have ZII
> Dev boards with me (which use mmc1).
>
Just checked on CFU1 and, with aliases in place, SD slot has a
consistent name across all platforms, so
detect mmc1
path="/mnt/mmc1.0"
global.bootm.image="${path}/zImage"
global.bootm.oftree="${path}/vf610-zii-${global.hostname}.dtb"
is probably all that's needed in "boot/sd". I also don't think that
"init/choose-dtb" is necessary anymore and can be probably be dropped.
Thanks,
Andrey Smirnov
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
