* [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts
@ 2017-06-13 13:37 Daniel Schultz
2017-06-13 13:42 ` Daniel Schultz
2017-06-19 7:25 ` Sascha Hauer
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Schultz @ 2017-06-13 13:37 UTC (permalink / raw)
To: barebox
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
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts
2017-06-13 13:37 [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts Daniel Schultz
@ 2017-06-13 13:42 ` Daniel Schultz
2017-06-19 7:25 ` Sascha Hauer
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Schultz @ 2017-06-13 13:42 UTC (permalink / raw)
To: barebox
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts
2017-06-13 13:37 [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts Daniel Schultz
2017-06-13 13:42 ` Daniel Schultz
@ 2017-06-19 7:25 ` Sascha Hauer
2017-06-20 15:37 ` Daniel Schultz
1 sibling, 1 reply; 4+ messages in thread
From: Sascha Hauer @ 2017-06-19 7:25 UTC (permalink / raw)
To: Daniel Schultz; +Cc: barebox
On Tue, Jun 13, 2017 at 03:37:08PM +0200, Daniel Schultz wrote:
> 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>
> ---
> +#!/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}"
This assumed there is one nfsroot for all users. The intention with the
original naming was that each user can create a link in his home
directory to wherever the nfsroot lives, which may include some globally
available nfsroot for all users. Why change it?
> +bootargs-ip
> +
> +global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp"
Why udp? Normally tcp is preferred, no?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts
2017-06-19 7:25 ` Sascha Hauer
@ 2017-06-20 15:37 ` Daniel Schultz
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Schultz @ 2017-06-20 15:37 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
Hi Sascha,
Am 19.06.2017 um 09:25 schrieb Sascha Hauer:
> On Tue, Jun 13, 2017 at 03:37:08PM +0200, Daniel Schultz wrote:
>> 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>
>> ---
>> +#!/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}"
>
> This assumed there is one nfsroot for all users. The intention with the
> original naming was that each user can create a link in his home
> directory to wherever the nfsroot lives, which may include some globally
> available nfsroot for all users. Why change it?
>
Seems like this was an older script. We will switch to the Barebox
network boot script.
>> +bootargs-ip
>> +
>> +global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp"
>
> Why udp? Normally tcp is preferred, no?
>
UDP is used as default by the nfsroot kernel system and also by tftp.
Additionally, we had troubles with booting in tcp mode.
> Sascha
>
--
Mit freundlichen Grüßen,
With best regards,
Daniel Schultz
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-20 15:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-13 13:37 [PATCH v4] arm: boards: phytec-som-am335x: Update boot scripts Daniel Schultz
2017-06-13 13:42 ` Daniel Schultz
2017-06-19 7:25 ` Sascha Hauer
2017-06-20 15:37 ` Daniel Schultz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox