[DistroKit] [PATCH] v8a: barebox: rockchip: disable CONFIG_MMCBLKDEV_ROOTARG

[DistroKit] [PATCH] v8a: barebox: rockchip: disable CONFIG_MMCBLKDEV_ROOTARG

[Ahmad Fatoum]

The help text of CONFIG_MMCBLKDEV_ROOTARG is pretty clear on that the
option should only be used when barebox and kernel aliases agree.
The upstream kernel DT aliases for all Radxa boards were recently
changed, so depending on whether we update kernel or barebox first,
we may experience breakage. Let's avoid this by using the default
PARTUUID-based root argument generation again until we have updated
both barebox and Linux to device tree revisions that agree.

[afa: It would be best if barebox' append_root feature could just
 use kernel aliases, but this is not totally trivial, as the root=
 entry is generated early at barebox mount time and kernel DT
 isn't known till boot]

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
This is required to boot currently used kernel with barebox-next.
---
 configs/platform-v8a/barebox-rockchip.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/platform-v8a/barebox-rockchip.config b/configs/platform-v8a/barebox-rockchip.config
index 109f55c12aba..c063a97b6de9 100644
--- a/configs/platform-v8a/barebox-rockchip.config
+++ b/configs/platform-v8a/barebox-rockchip.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=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
 CONFIG_SYSTEM_PARTITIONS=y
 CONFIG_IMD=y
-- 
2.39.2

Re: [DistroKit] [PATCH] v8a: barebox: rockchip: disable CONFIG_MMCBLKDEV_ROOTARG

[Robert Schwebel]

On Fri, Apr 14, 2023 at 06:34:29PM +0200, Ahmad Fatoum wrote:
> The help text of CONFIG_MMCBLKDEV_ROOTARG is pretty clear on that the
> option should only be used when barebox and kernel aliases agree.
> The upstream kernel DT aliases for all Radxa boards were recently
> changed, so depending on whether we update kernel or barebox first,
> we may experience breakage. Let's avoid this by using the default
> PARTUUID-based root argument generation again until we have updated
> both barebox and Linux to device tree revisions that agree.
> 
> [afa: It would be best if barebox' append_root feature could just
>  use kernel aliases, but this is not totally trivial, as the root=
>  entry is generated early at barebox mount time and kernel DT
>  isn't known till boot]
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> This is required to boot currently used kernel with barebox-next.

Applied to next.

rsc
-- 
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    |