From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 12 Dec 2023 18:58:50 +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 1rD71t-001Ulf-1m for lore@lore.pengutronix.de; Tue, 12 Dec 2023 18:58:50 +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 1rD71t-00039j-UR; Tue, 12 Dec 2023 18:58:49 +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 1rD71k-00039O-4y; Tue, 12 Dec 2023 18:58:40 +0100 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.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 1rD71j-00FOUh-Ow; Tue, 12 Dec 2023 18:58:39 +0100 Received: from rsc by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1rD71j-006fzg-MZ; Tue, 12 Dec 2023 18:58:39 +0100 Date: Tue, 12 Dec 2023 18:58:39 +0100 From: Robert Schwebel To: Roland Hieber Message-ID: <20231212175839.GW1528860@pengutronix.de> References: <9afb1d8a-f90d-7d74-781d-c33f6b7a2efb@pengutronix.de> <20231211093758.4021931-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20231211093758.4021931-1-rhi@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [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: distrokit@pengutronix.de, Ahmad Fatoum 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 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 > 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 > > > -- 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 |