DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 4/8] v7a: add RAUC support for rpi3
Date: Sun, 12 Feb 2023 23:14:45 +0100	[thread overview]
Message-ID: <20230212221449.1644628-5-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. The state and
  environment partitions can live in the first 4 MiB of the SD card, so
  move the the boot partition by the same amount.
* 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-rpi2-defaultenv/init/bootsource   |  5 +-
 .../barebox-rpi2-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-rpi2.config      |  3 +-
 configs/platform-v7a/barebox-rpi2.config.diff |  2 +
 .../platform-v7a/config/images/rpi2.config    |  5 ++
 ...ts-bcm2837-rpi-3-b-add-state-support.patch | 59 +++++++++++++++++++
 .../patches/barebox-2022.09.0/series          |  1 +
 .../lib/udev/rules.d/90-rauc-partitions.rules |  6 ++
 12 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default
 create mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix
 create mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot
 create mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot
 create mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets
 create mode 100644 configs/platform-v7a/patches/barebox-2022.09.0/0103-arm-dts-bcm2837-rpi-3-b-add-state-support.patch

diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource b/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource
index 4de71635720a..50f505f6266b 100644
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource
+++ b/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource
@@ -6,8 +6,7 @@ fi
 
 if [ $bootsource = mmc ]; then
 	global.boot.default="bootchooser net"
-elif [ $bootsource = net ]; then
-	global.boot.default="net bootchooser"
 else
-	global.boot.default="disk0.1 net"
+	global.boot.default="net bootchooser"
 fi
+
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default
new file mode 100644
index 000000000000..d7d9a373c50b
--- /dev/null
+++ b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default
@@ -0,0 +1 @@
+bootchooser net
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix
new file mode 100644
index 000000000000..6246412a5c27
--- /dev/null
+++ b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix
@@ -0,0 +1 @@
+state.bootstate
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot
new file mode 100644
index 000000000000..5676f868b380
--- /dev/null
+++ b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot
@@ -0,0 +1 @@
+disk0.1
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot
new file mode 100644
index 000000000000..1851d291c58c
--- /dev/null
+++ b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot
@@ -0,0 +1 @@
+disk0.2
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets
new file mode 100644
index 000000000000..f0fb14eeaad2
--- /dev/null
+++ b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets
@@ -0,0 +1 @@
+system0 system1
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 4788ff19a692..c8c92385382f 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -208,7 +208,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
@@ -290,6 +290,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-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 534b657b7448..a65fef755868 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,5 +1,7 @@
 44749ac3167836cbc7b473f78c4e9fea
 CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_BOOTCHOOSER=y
+CONFIG_CMD_BOOTCHOOSER=y
 # CONFIG_CMD_NVMEM is not set
 # CONFIG_CMD_USBGADGET is undefined
 CONFIG_DRIVER_SERIAL_NS16550=y
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 3dc404d36379..80f004e03bde 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -13,6 +13,7 @@ image @IMAGE@ {
 		disk-signature = 0xbedf7893
 	}
 	partition boot {
+		offset = 4M
 		image = rpi2-boot.vfat
 		partition-type = 0xc
 		bootable = true
@@ -21,6 +22,10 @@ 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/0103-arm-dts-bcm2837-rpi-3-b-add-state-support.patch b/configs/platform-v7a/patches/barebox-2022.09.0/0103-arm-dts-bcm2837-rpi-3-b-add-state-support.patch
new file mode 100644
index 000000000000..ec49b669e995
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2022.09.0/0103-arm-dts-bcm2837-rpi-3-b-add-state-support.patch
@@ -0,0 +1,59 @@
+From: Enrico Joerns <ejo@pengutronix.de>
+Date: Thu, 5 Jan 2017 17:46:36 +0100
+Subject: [PATCH] arm: dts: bcm2837-rpi-3-b: add state support
+
+Signed-off-by: Enrico Joerns <ejo@pengutronix.de>
+---
+ arch/arm/dts/bcm2837-rpi-3.dts | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/arch/arm/dts/bcm2837-rpi-3.dts b/arch/arm/dts/bcm2837-rpi-3.dts
+index e82d518fa551..086397ba35f5 100644
+--- a/arch/arm/dts/bcm2837-rpi-3.dts
++++ b/arch/arm/dts/bcm2837-rpi-3.dts
+@@ -1,5 +1,26 @@
+ #include <arm64/broadcom/bcm2837-rpi-3-b.dts>
+ 
++/ {
++	aliases {
++		state = &state;
++	};
++
++	state: state {
++		magic = <0x11fb08ef>;
++		compatible = "barebox,state";
++		backend-type = "raw";
++		backend = <&statepart>;
++		backend-stridesize = <0x80>;
++		backend-storage-type = "direct";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		bootstate: bootstate {};
++	};
++};
++
++#include "generic-bootstate.dtsi"
++
+ &{/memory@0} {
+ 	reg = <0x0 0x0>;
+ };
+@@ -7,3 +28,18 @@
+ &sdhci {
+ 	status = "disabled";
+ };
++
++&sdhost {
++        #address-cells = <1>;
++        #size-cells = <1>;
++
++        statepart: partition@100000 {
++                label = "barebox-state";
++                reg = <0x100000 0x100000>;
++        };
++
++        partition@200000 {
++                label = "barebox-environment";
++                reg = <0x200000 0x100000>;
++        };
++};
diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/series b/configs/platform-v7a/patches/barebox-2022.09.0/series
index 14a2ac07a71f..24a6b4c9896b 100644
--- a/configs/platform-v7a/patches/barebox-2022.09.0/series
+++ b/configs/platform-v7a/patches/barebox-2022.09.0/series
@@ -3,3 +3,4 @@
 0003-mci-core-fixup-broken-cd-information-into-kernel-DT.patch
 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
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 11b4e1c86a3c..87575bc15273 100644
--- a/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules
+++ b/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules
@@ -20,4 +20,10 @@ KERNEL=="mmcblk0p3", SYMLINK+="disk/by-usage/rootfs1"
 KERNEL=="mmcblk0p4", SYMLINK+="disk/by-usage/data"
 LABEL="beaglebone_black_end"
 
+ENV{OF_BASE_COMPATIBLE}!="*raspberrypi,3-model-b*", GOTO="rpi3_end"
+KERNEL=="mmcblk0p2", SYMLINK+="disk/by-usage/rootfs0"
+KERNEL=="mmcblk0p3", SYMLINK+="disk/by-usage/rootfs1"
+KERNEL=="mmcblk0p4", SYMLINK+="disk/by-usage/data"
+LABEL="rpi3_end"
+
 LABEL="rauc_partitions_end"
-- 
2.30.2




  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 ` Roland Hieber [this message]
2023-02-12 22:14 ` [DistroKit] [PATCH 5/8] v7a: add RAUC support for riotboard Roland Hieber
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-5-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