From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 5/8] v7a: add RAUC support for riotboard
Date: Sun, 12 Feb 2023 23:14:46 +0100 [thread overview]
Message-ID: <20230212221449.1644628-6-rhi@pengutronix.de> (raw)
In-Reply-To: <20230212221449.1644628-1-rhi@pengutronix.de>
* Enable barebox bootchooser framework
* Add a redundant root partition to the genimage config
* Add appropriate variables to the barebox defaultenv so the bootchooser
can decide into which partition to boot
* Add a state partition to the device tree
* Map partitions in rauc-udev compatibility layer
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../barebox-mx6-defaultenv/init/bootsource | 6 +--
.../barebox-mx6-defaultenv/nv/boot.default | 1 +
.../nv/bootchooser.state_prefix | 1 +
.../nv/bootchooser.system0.boot | 1 +
.../nv/bootchooser.system1.boot | 1 +
.../nv/bootchooser.targets | 1 +
configs/platform-v7a/barebox-mx6.config | 3 +-
configs/platform-v7a/barebox-mx6.config.diff | 2 +
.../config/images/riotboard.config | 6 +++
...ts-imx6s-riotboard-add-state-backend.patch | 53 +++++++++++++++++++
.../patches/barebox-2022.09.0/series | 1 +
.../lib/udev/rules.d/90-rauc-partitions.rules | 6 +++
12 files changed, 78 insertions(+), 4 deletions(-)
create mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default
create mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix
create mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot
create mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot
create mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets
create mode 100644 configs/platform-v7a/patches/barebox-2022.09.0/0104-arm-dts-imx6s-riotboard-add-state-backend.patch
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource b/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource
index ba0480949ec8..852cfd7d9611 100644
--- a/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource
+++ b/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource
@@ -4,10 +4,10 @@ if [ -n "$nv.boot.default" ]; then
exit
fi
-
if [ $bootsource = mmc ]; then
detect mmc$bootsource_instance
- global.boot.default="mmc$bootsource_instance net"
+ global.boot.default="bootchooser net"
else
- global.boot.default="net mmc1 mmc2 mmc3"
+ global.boot.default="net bootchooser"
fi
+
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default b/configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default
new file mode 100644
index 000000000000..d7d9a373c50b
--- /dev/null
+++ b/configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default
@@ -0,0 +1 @@
+bootchooser net
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix
new file mode 100644
index 000000000000..6246412a5c27
--- /dev/null
+++ b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix
@@ -0,0 +1 @@
+state.bootstate
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot
new file mode 100644
index 000000000000..597dd55b4974
--- /dev/null
+++ b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot
@@ -0,0 +1 @@
+mmc2.0
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot
new file mode 100644
index 000000000000..069ba3685643
--- /dev/null
+++ b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot
@@ -0,0 +1 @@
+mmc2.1
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets
new file mode 100644
index 000000000000..f0fb14eeaad2
--- /dev/null
+++ b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets
@@ -0,0 +1 @@
+system0 system1
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index d62cd2bf8ab1..ab2c77cb1889 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -283,7 +283,7 @@ CONFIG_BTHREAD=y
CONFIG_STATE=y
# CONFIG_STATE_CRYPTO is not set
# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
-# CONFIG_BOOTCHOOSER is not set
+CONFIG_BOOTCHOOSER=y
CONFIG_RESET_SOURCE=y
# CONFIG_MACHINE_ID is not set
# CONFIG_SYSTEMD_OF_WATCHDOG is not set
@@ -373,6 +373,7 @@ CONFIG_CMD_GO=y
# CONFIG_CMD_LOADY is not set
CONFIG_CMD_RESET=y
CONFIG_CMD_UIMAGE=y
+CONFIG_CMD_BOOTCHOOSER=y
# end of Boot
#
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 9efdf8c30380..93317b38199a 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -21,10 +21,12 @@ CONFIG_AT803X_PHY=y
CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
CONFIG_BCH=y
# CONFIG_BMP is not set
+CONFIG_BOOTCHOOSER=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_CACHE_L2X0 is not set
# CONFIG_CLOCKSOURCE_BCM283X is undefined
CONFIG_CLOCKSOURCE_IMX_GPT=y
+CONFIG_CMD_BOOTCHOOSER=y
# CONFIG_CMD_FBTEST is not set
# CONFIG_CMD_KEYSTORE is not set
CONFIG_CMD_MMC_EXTCSD=y
diff --git a/configs/platform-v7a/config/images/riotboard.config b/configs/platform-v7a/config/images/riotboard.config
index 32ca817e7362..f311fd5e41b0 100644
--- a/configs/platform-v7a/config/images/riotboard.config
+++ b/configs/platform-v7a/config/images/riotboard.config
@@ -15,6 +15,12 @@ image @IMAGE@ {
image = root.ext2
partition-type = 0x83
}
+
+ partition root-B {
+ image = root.ext2
+ partition-type = 0x83
+ }
+
partition data {
partition-type = 0x83
size = 512M
diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/0104-arm-dts-imx6s-riotboard-add-state-backend.patch b/configs/platform-v7a/patches/barebox-2022.09.0/0104-arm-dts-imx6s-riotboard-add-state-backend.patch
new file mode 100644
index 000000000000..1ba9897d98d7
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2022.09.0/0104-arm-dts-imx6s-riotboard-add-state-backend.patch
@@ -0,0 +1,53 @@
+From: Roland Hieber <rhi@pengutronix.de>
+Date: Sun, 12 Feb 2023 16:05:23 +0100
+Subject: [PATCH] arm: dts: imx6s-riotboard: add state backend
+
+Signed-off-by: Roland Hieber <rhi@pengutronix.de>
+---
+ arch/arm/dts/imx6s-riotboard.dts | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/arch/arm/dts/imx6s-riotboard.dts b/arch/arm/dts/imx6s-riotboard.dts
+index 9efef039a7eb..c0420a91a40e 100644
+--- a/arch/arm/dts/imx6s-riotboard.dts
++++ b/arch/arm/dts/imx6s-riotboard.dts
+@@ -17,8 +17,27 @@
+ device-path = &environment_usdhc4;
+ };
+ };
++
++ aliases {
++ state = &state_usdhc4;
++ };
++
++ state_usdhc4: state {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "barebox,state";
++ magic = <0x95ab2de7>;
++ backend-type = "raw";
++ backend = <&backend_state_usdhc4>;
++ backend-storage-type = "circular";
++ backend-stridesize = <0x40>;
++
++ bootstate: bootstate {};
++ };
+ };
+
++#include "generic-bootstate.dtsi"
++
+ &fec {
+ phy-reset-duration = <2>;
+ };
+@@ -36,6 +55,11 @@
+ label = "barebox-environment";
+ reg = <0xe0000 0x20000>;
+ };
++
++ backend_state_usdhc4: partition@100000 {
++ label = "barebox-state";
++ reg = <0x100000 0x40000>;
++ };
+ };
+
+ &ocotp {
diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/series b/configs/platform-v7a/patches/barebox-2022.09.0/series
index 24a6b4c9896b..999bb06b4e15 100644
--- a/configs/platform-v7a/patches/barebox-2022.09.0/series
+++ b/configs/platform-v7a/patches/barebox-2022.09.0/series
@@ -4,3 +4,4 @@
0101-arm-dts-refactor-bootstate-node-into-a-generic-templ.patch
0102-arm-dts-boneblack-add-beaglebone-black-state-entry.patch
0103-arm-dts-bcm2837-rpi-3-b-add-state-support.patch
+0104-arm-dts-imx6s-riotboard-add-state-backend.patch
diff --git a/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules b/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules
index 87575bc15273..970fc517edca 100644
--- a/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules
+++ b/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules
@@ -26,4 +26,10 @@ KERNEL=="mmcblk0p3", SYMLINK+="disk/by-usage/rootfs1"
KERNEL=="mmcblk0p4", SYMLINK+="disk/by-usage/data"
LABEL="rpi3_end"
+ENV{OF_BASE_COMPATIBLE}!="*riot,imx6s-riotboard*", GOTO="riotboard_end"
+KERNEL=="mmcblk0p1", SYMLINK+="disk/by-usage/rootfs0"
+KERNEL=="mmcblk0p2", SYMLINK+="disk/by-usage/rootfs1"
+KERNEL=="mmcblk0p3", SYMLINK+="disk/by-usage/data"
+LABEL="riotboard_end"
+
LABEL="rauc_partitions_end"
--
2.30.2
next prev parent reply other threads:[~2023-02-12 22:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-12 22:14 [DistroKit] [PATCH 0/8] v7a: add redundant update support via RAUC Roland Hieber
2023-02-12 22:14 ` [DistroKit] [PATCH 1/8] rauc-udev: add a compatibility layer for mapping partitions Roland Hieber
2023-02-13 9:43 ` Michael Olbrich
2023-03-02 9:33 ` Roland Hieber
2023-02-12 22:14 ` [DistroKit] [PATCH 2/8] v7a: add RAUC support for qemu-vexpress Roland Hieber
2023-03-08 9:33 ` Roland Hieber
2023-02-12 22:14 ` [DistroKit] [PATCH 3/8] v7a: add RAUC support for beaglebone black Roland Hieber
2023-02-12 22:14 ` [DistroKit] [PATCH 4/8] v7a: add RAUC support for rpi3 Roland Hieber
2023-02-12 22:14 ` Roland Hieber [this message]
2023-02-12 22:14 ` [DistroKit] [PATCH 6/8] v7a: kernel: enable features necessary for RAUC Roland Hieber
2023-02-13 7:33 ` Jan Lübbe
2023-02-12 22:14 ` [DistroKit] [PATCH 7/8] rauc: add initial support Roland Hieber
2023-02-13 7:37 ` Jan Lübbe
2023-03-02 9:41 ` Roland Hieber
2023-03-02 10:34 ` Jan Lübbe
2023-03-02 16:09 ` Michael Olbrich
2023-03-08 9:45 ` Roland Hieber
2023-02-12 22:14 ` [DistroKit] [PATCH 8/8] v7a: enable RAUC bundle creation Roland Hieber
2023-02-13 7:42 ` Jan Lübbe
2023-04-25 18:38 ` Roland Hieber
2023-02-13 7:48 ` [DistroKit] [PATCH 0/8] v7a: add redundant update support via RAUC Marco Felsch
2023-02-13 9:35 ` Roland Hieber
2023-03-07 12:04 ` Ahmad Fatoum
2023-03-08 10:11 ` Roland Hieber
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=20230212221449.1644628-6-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/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