summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Riedmueller <s.riedmueller@phytec.de>2019-05-06 11:40:04 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-05-10 07:28:44 (GMT)
commit64db934a28f4bc6652480483c0f7b3f1fb20b156 (patch)
tree2f48af2a83ab2aca5a7143693bd5fb3ac2eb40d5
parentf61bb5bdae0dd44a720ea0e0e6c1ebdc4810d523 (diff)
downloadmeta-phytec-64db934a28f4bc6652480483c0f7b3f1fb20b156.zip
meta-phytec-64db934a28f4bc6652480483c0f7b3f1fb20b156.tar.bz2
barebox: imx6ul: Use more generic boot script names for RAUC
Instead of nand0 and nand1 use system0 and system1 as boot script names for the RAUC boot scripts. This also reduces the risk of mix-ups between the nand0 bootscript and nand0 device. This actually happens in the barebox where the bootchooser tries to find a boot spec partition in nand0 if it attempts to boot with bootscript nand0. Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-bsp/barebox/barebox_2019.01.0-phy2.bb16
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-bsp/barebox/barebox_2019.01.0-phy2.bb b/recipes-bsp/barebox/barebox_2019.01.0-phy2.bb
index 812c538..f5b3251 100644
--- a/recipes-bsp/barebox/barebox_2019.01.0-phy2.bb
+++ b/recipes-bsp/barebox/barebox_2019.01.0-phy2.bb
@@ -107,7 +107,7 @@ global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs"
env_add(d, "nv/dhcp.vendor_id", "phytec")
#NAND boot scripts for RAUC
- env_add(d, "boot/nand0",
+ env_add(d, "boot/system0",
"""#!/bin/sh
[ -e /env/config-expansions ] && /env/config-expansions
@@ -119,7 +119,7 @@ global.bootm.oftree="/dev/nand0.root.ubi.oftree0"
global.linux.bootargs.dyn.root="root=ubi0:root0 ubi.mtd=root rootfstype=ubifs"
""")
- env_add(d, "boot/nand1",
+ env_add(d, "boot/system1",
"""#!/bin/sh
[ -e /env/config-expansions ] && /env/config-expansions
@@ -132,8 +132,8 @@ global.bootm.oftree="/dev/nand0.root.ubi.oftree1"
global.linux.bootargs.dyn.root="root=ubi0:root1 ubi.mtd=root rootfstype=ubifs"
""")
env_add(d, "nv/bootchooser.targets", """system0 system1""")
- env_add(d, "nv/bootchooser.system0.boot", """nand0""")
- env_add(d, "nv/bootchooser.system1.boot", """nand1""")
+ env_add(d, "nv/bootchooser.system0.boot", """system0""")
+ env_add(d, "nv/bootchooser.system1.boot", """system1""")
env_add(d, "nv/bootchooser.state_prefix", """state.bootstate""")
}
@@ -310,8 +310,8 @@ cp /mnt/tftp/root.ubifs /dev/nand0.root.ubi.root1
#No RAUC support for the low-cost Segin due to small NAND
python do_env_append_phyboard-segin-imx6ul-3() {
- env_rm(d, "boot/nand0")
- env_rm(d, "boot/nand1")
+ env_rm(d, "boot/system0")
+ env_rm(d, "boot/system1")
env_rm(d, "nv/bootchooser.targets")
env_rm(d, "nv/bootchooser.system0.boot")
env_rm(d, "nv/bootchooser.system1.boot")
@@ -357,8 +357,8 @@ python do_env_append_phyboard-segin-imx6ul-5() {
#Currently there is no rauc support for eMMC
python do_env_append_phyboard-segin-imx6ul-7() {
- env_rm(d, "boot/nand0")
- env_rm(d, "boot/nand1")
+ env_rm(d, "boot/system0")
+ env_rm(d, "boot/system1")
env_rm(d, "nv/bootchooser.targets")
env_rm(d, "nv/bootchooser.system0.boot")
env_rm(d, "nv/bootchooser.system1.boot")