From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 03 Apr 2024 18:48:25 +0200 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 1rs3mj-006nCL-06 for lore@lore.pengutronix.de; Wed, 03 Apr 2024 18:48:25 +0200 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 1rs3mi-00082U-9w; Wed, 03 Apr 2024 18:48:24 +0200 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 1rs3mb-0007to-B8; Wed, 03 Apr 2024 18:48:17 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.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 1rs3ma-00ADLm-Uq; Wed, 03 Apr 2024 18:48:16 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rs3ma-00GUKn-2e; Wed, 03 Apr 2024 18:48:16 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Wed, 3 Apr 2024 18:48:09 +0200 Message-Id: <20240403164815.3929378-3-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240403164815.3929378-1-a.fatoum@pengutronix.de> References: <20240403164815.3929378-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 2/8] v7a: barebox: rpi4: fix rpi4 bootstate definition 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 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 Unlike earlier Raspberry Pi variants, the SD-Card the Raspberry Pi 4 boots from isn't handled by the sdhost controller, but by the new emmc2 controller instead. Add an #ifdef to fix barebox state probe. Fixes: 2e0af7e3846c ("v7a: barebox: define state for all supported board variants") Signed-off-by: Ahmad Fatoum --- v2 -> v3: - no change v1 -> v2: - new patch While barebox works, booting Linux on the Raspberry Pi 4 gives SD errors. Fixing this is a separate endeavour though. --- configs/platform-v7a/dts/bootstate.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/platform-v7a/dts/bootstate.dtsi b/configs/platform-v7a/dts/bootstate.dtsi index 26b3bccef578..081ec804509b 100644 --- a/configs/platform-v7a/dts/bootstate.dtsi +++ b/configs/platform-v7a/dts/bootstate.dtsi @@ -58,7 +58,11 @@ }; }; +#ifdef bcm2711_rpi_4_dts +&emmc2 { +#else &sdhost { +#endif #address-cells = <1>; #size-cells = <1>; -- 2.39.2