From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 11 Dec 2023 10:38:15 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rCcju-000IDs-1W for lore@lore.pengutronix.de; Mon, 11 Dec 2023 10:38:15 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rCcju-0007ir-RT; Mon, 11 Dec 2023 10:38:14 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rCcjq-0007iF-AY; Mon, 11 Dec 2023 10:38:10 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rCcjp-00F4Be-Ua; Mon, 11 Dec 2023 10:38:09 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rCcjp-00GsOE-2s; Mon, 11 Dec 2023 10:38:09 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Mon, 11 Dec 2023 10:37:58 +0100 Message-Id: <20231211093758.4021931-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <9afb1d8a-f90d-7d74-781d-c33f6b7a2efb@pengutronix.de> References: <9afb1d8a-f90d-7d74-781d-c33f6b7a2efb@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [DistroKit] =?utf-8?q?=5BPATCH=5D_v7a=3A_barebox-stm32mp1=3A_pas?= =?utf-8?q?s_root=3DPARTUUID=3D=E2=80=A6_to_kernel?= X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum , Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 Signed-off-by: Roland Hieber --- 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