From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 20 Oct 2023 11:05:27 +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 1qtlRg-00FLYF-83 for lore@lore.pengutronix.de; Fri, 20 Oct 2023 11:05:27 +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 1qtlRf-0006jr-1I; Fri, 20 Oct 2023 11:05:27 +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 1qtlRa-0006gZ-J6; Fri, 20 Oct 2023 11:05:22 +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 1qtlRa-002zA1-5F; Fri, 20 Oct 2023 11:05:22 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qtlRa-00DvoB-0N; Fri, 20 Oct 2023 11:05:22 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Fri, 20 Oct 2023 11:05:16 +0200 Message-Id: <20231020090519.3320460-3-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231020090519.3320460-1-rhi@pengutronix.de> References: <20231020090519.3320460-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [DistroKit] =?utf-8?q?=5BPATCH_v3_3/6=5D_v7a=3A_barebox=3A_pass_?= =?utf-8?q?root=3DmmcblkXpN_instead_of_root=3DPARTUUID=3D=E2=80=A6_to_kern?= =?utf-8?q?el?= 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 Kernels prior to v5.10-rc1 could not ensure deterministic ordering for MMC devices. For this reason, the default 'append-root' behaviour of barebox for MMC block devices is to append a 'root=PARTUUID=XYZ' option to the kernel command line. The PARTUUID is derived from the partition table and is expected to be unique system-wide. This is however susceptible to breakage if the exact same image is written to different boot media in the system, e.g. SD and eMMC, so the PARTUUID will no longer uniquely refer to a single partition. Newer kernel versions honor the numbering used for 'mmc' aliases, which makes 'root=mmcblkXpN' deterministic as long as barebox and kernel aliases are identical. Since we're using kernel 6.4, enable this option in barebox. Signed-off-by: Roland Hieber --- PATCH v3: rebase to current next branch PATCH v2: no change PATCH v1: https://lore.distrokit.org/distrokit/20231010191631.31141-3-rhi@pengutronix.de --- configs/platform-v7a/barebox-am335x.config | 2 +- configs/platform-v7a/barebox-am335x.config.diff | 2 +- configs/platform-v7a/barebox-at91.config | 2 +- configs/platform-v7a/barebox-at91.config.diff | 2 +- configs/platform-v7a/barebox-mx6.config | 2 +- configs/platform-v7a/barebox-mx6.config.diff | 2 +- configs/platform-v7a/barebox-rpi2.config | 2 +- configs/platform-v7a/barebox-rpi2.config.diff | 2 +- configs/platform-v7a/barebox-stm32mp.config | 2 +- configs/platform-v7a/barebox-stm32mp.config.diff | 2 +- configs/platform-v7a/barebox-vexpress.config | 2 +- configs/platform-v7a/barebox-vexpress.config.diff | 2 +- configs/platform-v7a/barebox.config | 2 +- configs/platform-v7a_noneon/barebox-at91.config | 2 +- configs/platform-v7a_noneon/barebox-at91.config.diff | 2 +- configs/platform-v7a_noneon/barebox-vexpress.config | 2 +- configs/platform-v7a_noneon/barebox-vexpress.config.diff | 2 +- configs/platform-v7a_noneon/barebox.config | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index e15e865c4443..40228f3b51e7 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.config @@ -182,7 +182,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 899a66fc9381..95263f963905 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -00cfb07a044814b94b716078e86d3d9b +da4e754ab156cc4c96aeadfc6c19b73f # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index 194d187ff137..1e9d40511ee9 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -189,7 +189,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 0eca8ce55755..35b055a9fd77 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -00cfb07a044814b94b716078e86d3d9b +da4e754ab156cc4c96aeadfc6c19b73f CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 06fe1ce71272..49b0c0fb31dc 100644 --- a/configs/platform-v7a/barebox-mx6.config +++ b/configs/platform-v7a/barebox-mx6.config @@ -273,7 +273,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 8c231f94471c..ba8d9c81a273 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -00cfb07a044814b94b716078e86d3d9b +da4e754ab156cc4c96aeadfc6c19b73f # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 3bcbcc28b754..48c19d04bec7 100644 --- a/configs/platform-v7a/barebox-rpi2.config +++ b/configs/platform-v7a/barebox-rpi2.config @@ -175,7 +175,7 @@ CONFIG_BOOTM_OFTREE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index b3b496fca3a8..614e7151fd70 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -00cfb07a044814b94b716078e86d3d9b +da4e754ab156cc4c96aeadfc6c19b73f CONFIG_ARM_ASM_UNIFIED=y # CONFIG_CMD_NVMEM is not set CONFIG_DRIVER_NET_BCMGENET=y diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 76f051a68bb1..c9cb065ce3e1 100644 --- a/configs/platform-v7a/barebox-stm32mp.config +++ b/configs/platform-v7a/barebox-stm32mp.config @@ -171,7 +171,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index 23f14eeed6c1..5708326ae722 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -00cfb07a044814b94b716078e86d3d9b +da4e754ab156cc4c96aeadfc6c19b73f # 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 b/configs/platform-v7a/barebox-vexpress.config index ba2cb67c499c..596776ab88fa 100644 --- a/configs/platform-v7a/barebox-vexpress.config +++ b/configs/platform-v7a/barebox-vexpress.config @@ -158,7 +158,7 @@ CONFIG_BOOTM_OFTREE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index ff68e3efa1c3..24345a450c4e 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -00cfb07a044814b94b716078e86d3d9b +da4e754ab156cc4c96aeadfc6c19b73f CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index 7bc38c8cf20f..2cb5df8e4796 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -174,7 +174,7 @@ CONFIG_BOOTM_OFTREE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config index d66e099ecada..600417a314df 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config +++ b/configs/platform-v7a_noneon/barebox-at91.config @@ -180,7 +180,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y CONFIG_IMD=y diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff index 29584321f023..9a5ff84cf648 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config.diff +++ b/configs/platform-v7a_noneon/barebox-at91.config.diff @@ -1,4 +1,4 @@ -1dedd85e90c7b6ae44712caf6c69913b +4843d0dbea5da5cc603015348ad891de CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config index d2b7aa6c0073..cf504a6c606c 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config +++ b/configs/platform-v7a_noneon/barebox-vexpress.config @@ -158,7 +158,7 @@ CONFIG_BOOTM_OFTREE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y # CONFIG_SYSTEM_PARTITIONS is not set CONFIG_IMD=y diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff index fff891e02b70..2215ceb876cc 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff +++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -1dedd85e90c7b6ae44712caf6c69913b +4843d0dbea5da5cc603015348ad891de CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y diff --git a/configs/platform-v7a_noneon/barebox.config b/configs/platform-v7a_noneon/barebox.config index bbedcdb2d650..908bf1fe8d3f 100644 --- a/configs/platform-v7a_noneon/barebox.config +++ b/configs/platform-v7a_noneon/barebox.config @@ -174,7 +174,7 @@ CONFIG_BOOTM_OFTREE=y # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y -# CONFIG_MMCBLKDEV_ROOTARG is not set +CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y # CONFIG_SYSTEM_PARTITIONS is not set CONFIG_IMD=y -- 2.39.2