From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 11 Oct 2023 12:50:45 +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 1qqWnd-004NQi-RI for lore@lore.pengutronix.de; Wed, 11 Oct 2023 12:50:45 +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 1qqWnb-00078b-Pg; Wed, 11 Oct 2023 12:50:43 +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 1qqWnX-00071a-Qf; Wed, 11 Oct 2023 12:50:39 +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 1qqWnX-000soj-Bc; Wed, 11 Oct 2023 12:50:39 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qqWnX-005nBz-10; Wed, 11 Oct 2023 12:50:39 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Wed, 11 Oct 2023 12:50:35 +0200 Message-Id: <20231011105038.1380620-3-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231011105038.1380620-1-rhi@pengutronix.de> References: <20231011105038.1380620-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_v2_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 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 30a58497bc95..90e7756dabae 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.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/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 81e857d116e0..eeb39d3ffc0f 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -e1ec3277facf26f7ecc5fc49c9c31515 +767c9d2f029195d89d541b1de6347271 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined # CONFIG_AM33XX_NET_BOOT is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index 5dc6ec9dc51d..a9758bee288f 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -191,7 +191,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 937c41987be2..e90f18cb58e0 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -e1ec3277facf26f7ecc5fc49c9c31515 +767c9d2f029195d89d541b1de6347271 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined CONFIG_ARCH_AT91=y diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 0484d35e5087..8e8f0d78cef0 100644 --- a/configs/platform-v7a/barebox-mx6.config +++ b/configs/platform-v7a/barebox-mx6.config @@ -251,7 +251,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 93775f6509cf..f1308c66847c 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -e1ec3277facf26f7ecc5fc49c9c31515 +767c9d2f029195d89d541b1de6347271 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined # CONFIG_ARCH_BCM283X is not set diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 95de61f1c6b8..57250e40b6b6 100644 --- a/configs/platform-v7a/barebox-rpi2.config +++ b/configs/platform-v7a/barebox-rpi2.config @@ -179,7 +179,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 058f595cc787..6f8705a94859 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -e1ec3277facf26f7ecc5fc49c9c31515 +767c9d2f029195d89d541b1de6347271 CONFIG_ARM_ASM_UNIFIED=y CONFIG_BOOTCHOOSER=y CONFIG_CMD_BOOTCHOOSER=y diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 08a21f50c00e..af3552c4344b 100644 --- a/configs/platform-v7a/barebox-stm32mp.config +++ b/configs/platform-v7a/barebox-stm32mp.config @@ -170,7 +170,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 e951f3824fd3..034c89223848 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -e1ec3277facf26f7ecc5fc49c9c31515 +767c9d2f029195d89d541b1de6347271 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined # CONFIG_ARCH_BCM283X is not set diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 433c73be691c..1024c9d5f2bf 100644 --- a/configs/platform-v7a/barebox-vexpress.config +++ b/configs/platform-v7a/barebox-vexpress.config @@ -157,7 +157,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 ff170d222b86..1fce564357f0 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -e1ec3277facf26f7ecc5fc49c9c31515 +767c9d2f029195d89d541b1de6347271 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined CONFIG_AMBA_SP804=y diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index 27a6373837b0..f4d9cd21b11c 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -178,7 +178,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