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