All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Schultz <d.schultz@phytec.de>
To: barebox@lists.infradead.org
Subject: Re: [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts
Date: Tue, 13 Jun 2017 15:42:11 +0200	[thread overview]
Message-ID: <2ec5295d-6784-c1ea-a254-d03231752830@phytec.de> (raw)
In-Reply-To: <1497361028-39920-1-git-send-email-d.schultz@phytec.de>

could you also please apply these patches to the next release?

ls: Fix showing links to directories
fs: Implement links to directories
fs: drop path_check_prereq()
errno: Include string for ELOOP
arm: mach-omap: Change mountpoint of boot partitions
fs: Create automount entries for the default mount pathes

Daniel

Am 13.06.2017 um 15:37 schrieb Daniel Schultz:
> Expand the boot scripts with EMMC and add a default file source for
> expansions.
> 
> Removed "rw" and "rootwait" bootargs from existing boot scripts.
> Added "rootflags='data=journal'" bootarg to SD card boot script.
> 
> Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
> ---
>   .../phytec-som-am335x/defaultenv-physom-am335x/boot/emmc |  5 +++++
>   .../phytec-som-am335x/defaultenv-physom-am335x/boot/mmc  |  7 +++----
>   .../phytec-som-am335x/defaultenv-physom-am335x/boot/nand |  2 +-
>   .../phytec-som-am335x/defaultenv-physom-am335x/boot/net  | 15 +++++++++++++++
>   .../phytec-som-am335x/defaultenv-physom-am335x/boot/spi  |  2 +-
>   .../defaultenv-physom-am335x/init/bootsource             | 16 ++++++++++++----
>   6 files changed, 37 insertions(+), 10 deletions(-)
>   create mode 100644 arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/emmc
>   create mode 100644 arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/net
> 
> diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/emmc b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/emmc
> new file mode 100644
> index 0000000..b1792a6
> --- /dev/null
> +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/emmc
> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +
> +global.bootm.image=/mnt/mmc1.0/linuximage
> +global.bootm.oftree=/mnt/mmc1.0/oftree
> +global.linux.bootargs.dyn.root="root=/dev/mmcblk1p2 rootflags='data=journal'"
> diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/mmc b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/mmc
> index 834669d..77a076d 100644
> --- a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/mmc
> +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/mmc
> @@ -1,6 +1,5 @@
>   #!/bin/sh
>   
> -global.bootm.image=/boot/linuximage
> -global.bootm.oftree=/boot/oftree
> -
> -global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rw rootwait"
> +global.bootm.image=/mnt/mmc0.0/linuximage
> +global.bootm.oftree=/mnt/mmc0.0/oftree
> +global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootflags='data=journal'"
> diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand
> index ece44b7..33f5f02 100644
> --- a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand
> +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand
> @@ -5,4 +5,4 @@
>   global.bootm.image="/dev/nand0.root.ubi.kernel"
>   global.bootm.oftree="/dev/nand0.root.ubi.oftree"
>   
> -global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rw rootfstype=ubifs"
> +global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs"
> diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/net b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/net
> new file mode 100644
> index 0000000..1005199
> --- /dev/null
> +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/net
> @@ -0,0 +1,15 @@
> +#!/bin/sh
> +
> +path="/mnt/tftp"
> +
> +global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
> +
> +oftree="${path}/${global.user}-oftree-${global.hostname}"
> +if [ -f "${oftree}" ]; then
> +    global.bootm.oftree="$oftree"
> +fi
> +
> +nfsroot="/nfsroot/${global.hostname}"
> +bootargs-ip
> +
> +global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp"
> diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/spi b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/spi
> index 71c5834..a321aa9 100644
> --- a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/spi
> +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/spi
> @@ -4,4 +4,4 @@ global.bootm.image="/dev/m25p0.kernel"
>   global.bootm.oftree="/dev/m25p0.oftree"
>   
>   # Use rootfs from NAND
> -global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rw rootfstype=ubifs"
> +global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"
> diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/init/bootsource b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/init/bootsource
> index 3f2ff4b..61a0879 100644
> --- a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/init/bootsource
> +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/init/bootsource
> @@ -4,12 +4,20 @@ if [ -n "$nv.boot.default" ]; then
>   	exit
>   fi
>   
> -if [ $bootsource = mmc ]; then
> -	global.boot.default="mmc nand spi net"
> +if [ -e /dev/mmc1.0 ]; then
> +	nvmem="emmc"
> +else
> +	nvmem="nand"
> +fi
> +
> +if [ $bootsource = mmc -a $bootsource_instance = 1 ]; then
> +	global.boot.default="emmc mmc spi net"
> +elif [ $bootsource = mmc -a $bootsource_instance = 0 ]; then
> +	global.boot.default="mmc $nvmem spi net"
>   elif [ $bootsource = nand ]; then
>   	global.boot.default="nand spi mmc net"
>   elif [ $bootsource = spi ]; then
> -	global.boot.default="spi nand mmc net"
> +	global.boot.default="spi $nvmem mmc net"
>   elif [ $bootsource = net ]; then
> -	global.boot.default="net nand spi mmc"
> +	global.boot.default="net $nvmem spi mmc"
>   fi
> 

-- 
Mit freundlichen Grüßen,
With best regards,
   Daniel Schultz

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

  reply	other threads:[~2017-06-13 13:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-13 13:37 [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts Daniel Schultz
2017-06-13 13:42 ` Daniel Schultz [this message]
2017-06-19  7:25 ` Sascha Hauer
2017-06-20 15:37   ` Daniel Schultz

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=2ec5295d-6784-c1ea-a254-d03231752830@phytec.de \
    --to=d.schultz@phytec.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.