From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH v3 3/6] v7a: barebox: pass root=mmcblkXpN instead of root=PARTUUID=… to kernel
Date: Fri, 20 Oct 2023 11:05:16 +0200 [thread overview]
Message-ID: <20231020090519.3320460-3-rhi@pengutronix.de> (raw)
In-Reply-To: <20231020090519.3320460-1-rhi@pengutronix.de>
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 <rhi@pengutronix.de>
---
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
next prev parent reply other threads:[~2023-10-20 9:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 9:05 [DistroKit] [PATCH v3 1/6] v7a: image-stm32mp: use 'partition-table-type' option instead of 'gpt' Roland Hieber
2023-10-20 9:05 ` [DistroKit] [PATCH v3 2/6] images: use 'partition-table-type' option instead of 'partition-table' Roland Hieber
2023-10-20 9:05 ` Roland Hieber [this message]
2023-11-22 13:27 ` [DistroKit] [PATCH v3 3/6] v7a: barebox: pass root=mmcblkXpN instead of root=PARTUUID=… to kernel Ahmad Fatoum
2023-11-22 14:17 ` Roland Hieber
2023-11-22 14:24 ` Ahmad Fatoum
2023-12-11 9:37 ` [DistroKit] [PATCH] v7a: barebox-stm32mp1: pass " Roland Hieber
2023-12-12 17:58 ` Robert Schwebel
2023-10-20 9:05 ` [DistroKit] [PATCH v3 4/6] v7a: barebox: enable GUID Partition Table support Roland Hieber
2023-10-20 9:05 ` [DistroKit] [PATCH v3 5/6] images: remove qemu size hack Roland Hieber
2023-10-20 9:05 ` [DistroKit] [PATCH v3 6/6] images: convert to GPT format Roland Hieber
2023-10-20 10:56 ` [DistroKit] [PATCH v3 1/6] v7a: image-stm32mp: use 'partition-table-type' option instead of 'gpt' Robert Schwebel
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=20231020090519.3320460-3-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