From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 26 Sep 2023 11:27:33 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) 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 1ql4Lu-00Bndc-57 for lore@lore.pengutronix.de; Tue, 26 Sep 2023 11:27:33 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ql4Lj-0008Kv-T0; Tue, 26 Sep 2023 11:27:23 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ql4Le-0008Dt-Pp; Tue, 26 Sep 2023 11:27:18 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ql4Le-0094aQ-DB; Tue, 26 Sep 2023 11:27:18 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1ql4Le-00FZt6-0w; Tue, 26 Sep 2023 11:27:18 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Tue, 26 Sep 2023 11:27:12 +0200 Message-Id: <20230926092713.3680509-4-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230926092713.3680509-1-rhi@pengutronix.de> References: <20230926092713.3680509-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 4/5] v7a: barebox-common: enable bootchooser 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: Roland Hieber 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Bootchooser will choose the correct redundant A/B partition for booting. Enable it in the common barebox so it is available on all v7a boards. Signed-off-by: Roland Hieber --- configs/platform-v7a/barebox-am335x.config.diff | 4 +--- configs/platform-v7a/barebox-at91.config | 3 ++- configs/platform-v7a/barebox-at91.config.diff | 2 +- configs/platform-v7a/barebox-mx6.config.diff | 4 +--- configs/platform-v7a/barebox-rpi2.config.diff | 4 +--- .../barebox-stm32mp-defaultenv/nv/bootchooser.targets | 1 + configs/platform-v7a/barebox-stm32mp.config | 3 ++- configs/platform-v7a/barebox-stm32mp.config.diff | 2 +- configs/platform-v7a/barebox-vexpress.config.diff | 4 +--- configs/platform-v7a/barebox.config | 3 ++- 10 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index cddc0de393c9..899a66fc9381 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -c99109294087967eb44519ee3d12f204 +00cfb07a044814b94b716078e86d3d9b # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -14,13 +14,11 @@ CONFIG_ARM_BOARD_APPEND_ATAG=y # CONFIG_BAREBOX_UPDATE_AM33XX_EMMC is not set # CONFIG_BAREBOX_UPDATE_AM33XX_NAND is not set CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO=y -CONFIG_BOOTCHOOSER=y CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_BUS_OMAP_GPMC=y # CONFIG_CLKDEV_LOOKUP is undefined # CONFIG_CLOCKSOURCE_BCM283X is undefined CONFIG_CLOCKSOURCE_TI_DM=y -CONFIG_CMD_BOOTCHOOSER=y # CONFIG_CMD_CLK is undefined # CONFIG_CMD_KEYSTORE is not set CONFIG_CMD_NAND=y diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index a8e7f4754bb2..194d187ff137 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -220,7 +220,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 @@ -315,6 +315,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-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index db3c631e22fe..0eca8ce55755 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -c99109294087967eb44519ee3d12f204 +00cfb07a044814b94b716078e86d3d9b CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index ae78c294cb6d..8c231f94471c 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -c99109294087967eb44519ee3d12f204 +00cfb07a044814b94b716078e86d3d9b # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -19,12 +19,10 @@ 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_FCB=y # CONFIG_CMD_KEYSTORE is not set diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 8010b4afb43d..b3b496fca3a8 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,7 +1,5 @@ -c99109294087967eb44519ee3d12f204 +00cfb07a044814b94b716078e86d3d9b 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/barebox-stm32mp-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets new file mode 100644 index 000000000000..f0fb14eeaad2 --- /dev/null +++ b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets @@ -0,0 +1 @@ +system0 system1 diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 95411c71910f..76f051a68bb1 100644 --- a/configs/platform-v7a/barebox-stm32mp.config +++ b/configs/platform-v7a/barebox-stm32mp.config @@ -204,7 +204,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 @@ -295,6 +295,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-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index d2aac4ca8e5c..23f14eeed6c1 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -c99109294087967eb44519ee3d12f204 +00cfb07a044814b94b716078e86d3d9b # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 25c65fab5e7e..ff68e3efa1c3 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -c99109294087967eb44519ee3d12f204 +00cfb07a044814b94b716078e86d3d9b CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y @@ -6,10 +6,8 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined # CONFIG_ARM_USE_COMPRESSED_DTB is undefined -CONFIG_BOOTCHOOSER=y # CONFIG_CFI_BUFFER_WRITE is not set # CONFIG_CLOCKSOURCE_BCM283X is undefined -CONFIG_CMD_BOOTCHOOSER=y # CONFIG_CMD_GPIO is undefined # CONFIG_CMD_SMC is undefined CONFIG_CONSOLE_ACTIVATE_ALL=y diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index a88bca4a0dbe..7bc38c8cf20f 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -205,7 +205,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 @@ -295,6 +295,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 # -- 2.39.2