From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 03 Apr 2024 11:06:46 +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 1rrwZy-005bl0-1w for lore@lore.pengutronix.de; Wed, 03 Apr 2024 11:06:46 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rrwZy-0008Pw-1K for lore@pengutronix.de; Wed, 03 Apr 2024 11:06:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=tskXyXp++xu5RDCMzk9cyFrOZ6M4n/6zLLF0HEyIu1I=; b=EtXqwLtxe7vOPABrVKi5DseCaK ZxDqBU3fyMPw7HeDsf3brYWvKkjtu/E8MbHcCtK725FONJdkcwiAxrAPJQJsJkdBGBaZVF/tRkuQ9 I7JZ4WgmJVMNzcq+tDLPEnzNXMPNNt+e/Wqy+wZXD9vmwtsI7fUutRPNUK5rRLNwBY3uQT1mT04tv hRSPqU6uvzNprEtZWtPlrv7OXrOX41H/Mh4atf37qfqu3aC1R3NMADIrIXgUqpEJhPhTtjh38u3oZ uvuxTlFzZhbgE3p2fAII+0x111iHHArF03fBYM2QOM9fObY2QKsiy+RuSctEZM/C7r1mRjIcqTGEF jYxTCvkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrwZM-0000000F73y-1jmu; Wed, 03 Apr 2024 09:06:08 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrwZI-0000000F72W-2nFf for barebox@lists.infradead.org; Wed, 03 Apr 2024 09:06:05 +0000 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 1rrwZH-0007wy-EI; Wed, 03 Apr 2024 11:06:03 +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 1rrwZH-00A8vE-1D; Wed, 03 Apr 2024 11:06:03 +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 1rrwZG-00CV4X-34; Wed, 03 Apr 2024 11:06:02 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 3 Apr 2024 11:06:02 +0200 Message-Id: <20240403090602.2978695-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240403_020604_737386_C95989CE X-CRM114-Status: UNSURE ( 8.07 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] ARM: rpi: detect mci1 as well when searching for environment X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On Raspberry Pi 4, which lacks aliases like other Raspberry Pis, the SD-Card is named mci1, while mci0 is the SDIO card. Therefore detect both mci0 and mci1 in hope that one of them will provide disk0. This is safe to do as barebox will now gracefully skip SDIO cards during probe. Signed-off-by: Ahmad Fatoum --- arch/arm/boards/raspberry-pi/rpi-common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c index 7c82c740e256..924d4425bd87 100644 --- a/arch/arm/boards/raspberry-pi/rpi-common.c +++ b/arch/arm/boards/raspberry-pi/rpi-common.c @@ -192,6 +192,7 @@ static int rpi_env_init(void) int ret; device_detect_by_name("mci0"); + device_detect_by_name("mci1"); diskdev = "/dev/disk0.0"; ret = stat(diskdev, &s); -- 2.39.2