[DistroKit] [PATCH 3/4] v7a: barebox: don't use root=PARTUUID= when booting from SD/eMMC

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

The stm32mp images may be written to both SD and eMMC, so it's important
that barebox identifies the boot medium uses for root= unambiguously and
not via PARTUUID= which may be equal if the exact same image is written
to both SD and eMMC

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/barebox-stm32mp.config      | 2 +-
 configs/platform-v7a/barebox-stm32mp.config.diff | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index afba652187a9..0de53381925b 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -171,7 +171,7 @@ CONFIG_BOOTM_FITIMAGE=y
 # CONFIG_BOOTM_FITIMAGE_SIGNATURE 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 6c285c6793bc..23f80f70d3ee 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -99,7 +99,6 @@ CONFIG_MFD_STM32_TIMERS=y
 CONFIG_MFD_STPMIC1=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MICREL_PHY=y
-# CONFIG_MMCBLKDEV_ROOTARG is not set
 # CONFIG_MTD is not set
 # CONFIG_MTD_CONCAT is undefined
 # CONFIG_MTD_DATAFLASH is undefined
-- 
2.39.2