summaryrefslogtreecommitdiff
path: root/recipes-bsp
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2016-02-03 09:57:07 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-02-12 17:07:23 +0100
commit7e4fec78507068e3030d6223938fb13ec00a0284 (patch)
treedf33897b07c6ea6601cf3a2b14642b8e0fb84635 /recipes-bsp
parenta01613b72ae2f75ab083469f31df3c93df73589e (diff)
downloadmeta-phytec-7e4fec78507068e3030d6223938fb13ec00a0284.tar.bz2
meta-phytec-7e4fec78507068e3030d6223938fb13ec00a0284.zip
barebox: env: use nv variable 'rootfs' and set to 'ro'
Use a global nv variable for the generic root filesystem kernel parameters. Some of them are common for all boot devices. Switch "rw" to "ro". Now the kernel mounts the root filesystem readonly. The init system will remount it rewrite based on the settings in fstab if needed. It's important that the filesystem is readonly first because fsck (e.g. for the ext4 filesystem) in the boot process can only run if the filesystem is mounted readonly beforehand. The option 'rootwait' is now used for all boot devices and not only for "mmc". This option should not harm the other boot options since it only delays the boot process if the rootfs cannot be found immediately. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/mmc2
-rw-r--r--recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/nand2
-rw-r--r--recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/net2
-rw-r--r--recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/spi2
-rw-r--r--recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/nv/linux.bootargs.rootfs1
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/emmc2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/mmc2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/net2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/mmc2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/nand2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/net2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/spi2
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/nv/linux.bootargs.rootfs1
13 files changed, 13 insertions, 11 deletions
diff --git a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/mmc b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/mmc
index 3196011..d2fa6a6 100644
--- a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/mmc
+++ b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/mmc
@@ -4,4 +4,4 @@
global.bootm.image="/mnt/mmc/zImage"
global.bootm.oftree="/mnt/mmc/oftree"
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait rw"
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2"
diff --git a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/nand b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/nand
index 0dca8ab..792fd9e 100644
--- a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/nand
+++ b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/nand
@@ -4,4 +4,4 @@
global.bootm.image="/dev/nand0.kernel.bb"
global.bootm.oftree="/dev/nand0.oftree.bb"
-global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs"
diff --git a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/net b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/net
index dba463a..aa39d63 100644
--- a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/net
+++ b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/net
@@ -13,4 +13,4 @@ fi
nfsroot="/nfsroot/${global.hostname}"
bootargs-ip
-global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp rw"
+global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp"
diff --git a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/spi b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/spi
index 9aa71ef..9663467 100644
--- a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/spi
+++ b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/boot/spi
@@ -4,4 +4,4 @@
global.bootm.image="/dev/m25p0.kernel"
global.bootm.oftree="/dev/m25p0.oftree"
-global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs"
diff --git a/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/nv/linux.bootargs.rootfs b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/nv/linux.bootargs.rootfs
new file mode 100644
index 0000000..e33ec00
--- /dev/null
+++ b/recipes-bsp/barebox/env-2015.07.0-phy2/mx6/commonenv/nv/linux.bootargs.rootfs
@@ -0,0 +1 @@
+rootwait ro
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/emmc b/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/emmc
index de76e95..b13b3c8 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/emmc
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/emmc
@@ -4,4 +4,4 @@ mkdir -p /mnt/emmc
mount /dev/mmc1.0 /mnt/emmc
global.bootm.image=/mnt/emmc/linuximage
global.bootm.oftree=/mnt/emmc/oftree
-global.linux.bootargs.dyn.root="root=/dev/mmcblk1p2 rootwait rw"
+global.linux.bootargs.dyn.root="root=/dev/mmcblk1p2"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/mmc b/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/mmc
index 147bf9e..4f0f0b8 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/mmc
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/mmc
@@ -4,4 +4,4 @@ mkdir -p /mnt/mmc
mount /dev/mmc0.0 /mnt/mmc/
global.bootm.image=/mnt/mmc/linuximage
global.bootm.oftree=/mnt/mmc/oftree
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait rw"
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/net b/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/net
index 1281066..ca59a62 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/net
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/beagleboneblack-1/machineenv/boot/net
@@ -11,4 +11,4 @@ fi
nfsroot="/nfsroot/${global.hostname}"
bootargs-ip
-global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp rw"
+global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/mmc b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/mmc
index 0d2cb4a..839f6c3 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/mmc
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/mmc
@@ -4,4 +4,4 @@
global.bootm.image=/boot/linuximage
global.bootm.oftree=/boot/oftree
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait rw"
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/nand b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/nand
index 0dca8ab..792fd9e 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/nand
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/nand
@@ -4,4 +4,4 @@
global.bootm.image="/dev/nand0.kernel.bb"
global.bootm.oftree="/dev/nand0.oftree.bb"
-global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/net b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/net
index 7bbceaf..e036a17 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/net
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/net
@@ -14,4 +14,4 @@ bootargs-ip
[ -e /env/config-expansions ] && /env/config-expansions
-global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp rw"
+global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/spi b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/spi
index a7433ac..aad3974 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/spi
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/boot/spi
@@ -5,4 +5,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=root rootfstype=ubifs rw"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/nv/linux.bootargs.rootfs b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/nv/linux.bootargs.rootfs
new file mode 100644
index 0000000..e33ec00
--- /dev/null
+++ b/recipes-bsp/barebox/env-2015.09.0-phy4/ti33x/commonenv/nv/linux.bootargs.rootfs
@@ -0,0 +1 @@
+rootwait ro