mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: Vivien Didelot <vivien.didelot@gmail.com>
Cc: Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH v2 1/2] ARM: zii-vf610-dev: fix boot from SD
Date: Wed, 23 Jan 2019 19:20:29 -0800	[thread overview]
Message-ID: <CAHQ1cqHbQQnW84EwsjjRP63ci_kqr=FUMm4FAboWJ7EHQ_k4ww@mail.gmail.com> (raw)
In-Reply-To: <20190123151620.4398-1-vivien.didelot@gmail.com>

On Wed, Jan 23, 2019 at 7:16 AM Vivien Didelot <vivien.didelot@gmail.com> wrote:
>
> 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.
>

Looks good to me:

Reviewed-by: Andrey Smirnov <andrew.smirnov@gmail.com>

> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
> ---
>  .../zii-vf610-dev/defaultenv-zii-vf610-dev/boot/sd  |  8 ++++++--
>  .../defaultenv-zii-vf610-dev/init/automount-sd      | 13 -------------
>  .../defaultenv-zii-vf610-dev/init/choose-dtb        |  4 ----
>  3 files changed, 6 insertions(+), 19 deletions(-)
>  delete mode 100644 arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/automount-sd
>  delete mode 100644 arch/arm/boards/zii-vf610-dev/defaultenv-zii-vf610-dev/init/choose-dtb
>
> 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..92dfae0ab 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 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
> 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 41a74c3a9..000000000
> --- 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
> -
> --
> 2.20.1
>

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-01-24  3:20 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-23 15:16 Vivien Didelot
2019-01-23 15:16 ` [PATCH v2 2/2] ARM: zii-vf610-dev: boot initrd " Vivien Didelot
2019-01-24  3:21   ` Andrey Smirnov
2019-01-24  3:20 ` Andrey Smirnov [this message]
2019-01-24  7:37 ` [PATCH v2 1/2] ARM: zii-vf610-dev: fix boot " Sascha Hauer

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='CAHQ1cqHbQQnW84EwsjjRP63ci_kqr=FUMm4FAboWJ7EHQ_k4ww@mail.gmail.com' \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=vivien.didelot@gmail.com \
    /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