Re: [DistroKit] [PATCH] v7a: barebox-stm32mp1: pass root=PARTUUID=… to kernel

[Robert Schwebel <r.schwebel@pengutronix.de>]

Applied to next.

On Mon, Dec 11, 2023 at 10:37:58AM +0100, Roland Hieber wrote:
> This partly reverts commit e0ca556db7983a99acc3330dc32cdae395e84003.
> 
> As Ahmad reports, the kernel device tree of STM32MP157C-EV1 has no
> aliases at all, which is a precondition for enabling MMCBLKDEV_ROOTARG
> in barebox. Restore the old state which detects the PARTUUID of the root
> partition and passes it to the kernel.
> 
> Link: https://lore.distrokit.org/distrokit/9afb1d8a-f90d-7d74-781d-c33f6b7a2efb@pengutronix.de
> Fixes: e0ca556db7983a99acc3 (2023-10-20, "v7a: barebox: pass root=mmcblkXpN instead of root=PARTUUID=… to kernel")
> Reported-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-v7a/barebox-stm32mp.config      | 2 +-
>  configs/platform-v7a/barebox-stm32mp.config.diff | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
> index c9cb065ce3e1..76f051a68bb1 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=y
> +# CONFIG_MMCBLKDEV_ROOTARG is not set
>  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 3a4ebf51a091..f1511064ff62 100644
> --- a/configs/platform-v7a/barebox-stm32mp.config.diff
> +++ b/configs/platform-v7a/barebox-stm32mp.config.diff
> @@ -82,6 +82,7 @@ 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
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |