From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Aug 2023 18:39:04 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qVaau-003zEg-TM for lore@lore.pengutronix.de; Mon, 14 Aug 2023 18:39:04 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qVaat-0007rO-53; Mon, 14 Aug 2023 18:39:03 +0200 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qVaZ2-0007S5-Si; Mon, 14 Aug 2023 18:37:08 +0200 Received: from rsc by pty.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qVaZ2-00CQl7-EF; Mon, 14 Aug 2023 18:37:08 +0200 Date: Mon, 14 Aug 2023 18:37:08 +0200 From: Robert Schwebel To: Roland Hieber Message-ID: References: <20230623124755.2292833-1-rhi@pengutronix.de> <20230623124755.2292833-8-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230623124755.2292833-8-rhi@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Mailman-Approved-At: Mon, 14 Aug 2023 18:39:01 +0200 Subject: Re: [DistroKit] [PATCH 07/14] v7a: add RAUC support for rpi3 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Applied to next. On Fri, Jun 23, 2023 at 02:47:48PM +0200, Roland Hieber wrote: > * 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 backend to the device tree fragment > * Map partitions in rauc-udev compatibility layer > > Signed-off-by: Roland Hieber > --- > .../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 +++ > configs/platform-v7a/dts/bootstate.dtsi | 35 +++++++++++++++++++ > .../lib/udev/rules.d/90-rauc-partitions.rules | 7 ++++ > 11 files changed, 58 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 > > 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 70fba6eeedc2..95de61f1c6b8 100644 > --- a/configs/platform-v7a/barebox-rpi2.config > +++ b/configs/platform-v7a/barebox-rpi2.config > @@ -210,7 +210,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 > @@ -299,6 +299,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 e6dce16ce7d4..058f595cc787 100644 > --- a/configs/platform-v7a/barebox-rpi2.config.diff > +++ b/configs/platform-v7a/barebox-rpi2.config.diff > @@ -1,5 +1,7 @@ > e1ec3277facf26f7ecc5fc49c9c31515 > CONFIG_ARM_ASM_UNIFIED=y > +CONFIG_BOOTCHOOSER=y > +CONFIG_CMD_BOOTCHOOSER=y > # CONFIG_CMD_NVMEM is not set > CONFIG_DRIVER_NET_BCMGENET=y > 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/dts/bootstate.dtsi b/configs/platform-v7a/dts/bootstate.dtsi > index 845950712e37..6415dcc0fa68 100644 > --- a/configs/platform-v7a/dts/bootstate.dtsi > +++ b/configs/platform-v7a/dts/bootstate.dtsi > @@ -39,6 +39,41 @@ > }; > #endif > > +/** Raspberry Pi 3 Model B ****************************************************/ > +#ifdef bcm2837_rpi_3_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>; > + }; > +}; > + > +&sdhost { > + #address-cells = <1>; > + #size-cells = <1>; > + > + statepart: partition@100000 { > + label = "barebox-state"; > + reg = <0x100000 0x100000>; > + }; > + > + partition@200000 { > + label = "barebox-environment"; > + reg = <0x200000 0x100000>; > + }; > +}; > +#endif > + > /** Generic bootstate node for all platforms **********************************/ > / { > state: state { > 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 b5c75d1ece7d..fde6c84b0c05 100644 > --- a/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules > +++ b/projectroot/usr/lib/udev/rules.d/90-rauc-partitions.rules > @@ -22,6 +22,13 @@ KERNEL=="mmcblk0p4", SYMLINK+="disk/by-usage/data" > GOTO="rauc_partitions_end" > 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" > +GOTO="rauc_partitions_end" > +LABEL="rpi3_end" > + > # fallback for boards not yet supported by RAUC > KERNEL=="mmcblk0p3", SYMLINK+="disk/by-usage/data" > > -- > 2.39.2 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |