From nobody Tue Feb 10 15:45:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68819+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68819+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1607988248; cv=none; d=zohomail.com; s=zohoarc; b=mhl2NxJHhh1xdcvNxozOHBzs/V0UqgyS75CGGegIbi0HqpiQiFGvRGIjPpMBPKJTthKXtXszf0sw2yPXml2B9Hl7aA+cZ+du7JpYnW0nUOng3AYsPq6L8gReQi7vXLq8sYNKeaJt2OWoNY8Kmpjg+B2lsSjJhTiWCwdXcdN6TG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607988248; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=xtdsTsr/VU1xEDVSaaX1cee/yofODlommtkfQF5vIGI=; b=j+8ANajbNU9i+xijXevabY1IFRb6h30XBt7LMSdEVBTGunBcT8+/FpWzuPTTI5npgXHXE3Wua0OUMPTWbH206ZMC9WU8g+3yVnn1zJXZwb6I6iIvuEm2hSPO9eaM3uBn9laJHaLKoqplkEfeEG4FFgiTkffuPwpd/tCLshvBBbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68819+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1607988248172388.5202533447332; Mon, 14 Dec 2020 15:24:08 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Uy7cYY1788612xqfGot4ihlr; Mon, 14 Dec 2020 15:24:07 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.2536.1607988242233865700 for ; Mon, 14 Dec 2020 15:24:02 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E697931B; Mon, 14 Dec 2020 15:24:01 -0800 (PST) X-Received: from mammon-tx2.austin.arm.com (mammon-tx2.austin.arm.com [10.118.28.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D6EE23F66E; Mon, 14 Dec 2020 15:24:01 -0800 (PST) From: "Jeremy Linton" To: devel@edk2.groups.io Cc: ard.biesheuvel@arm.com, leif@nuviainc.com, pete@akeo.ie, andrey.warkentin@gmail.com, samer.el-haj-mahmoud@arm.com, Jeremy Linton Subject: [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path removal. Date: Mon, 14 Dec 2020 17:23:50 -0600 Message-Id: <20201214232350.1192387-8-jeremy.linton@arm.com> In-Reply-To: <20201214232350.1192387-1-jeremy.linton@arm.com> References: <20201214232350.1192387-1-jeremy.linton@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jeremy.linton@arm.com X-Gm-Message-State: qVV27KU8L190gYujN7LAKkqyx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1607988247; bh=eJd8hJ20WEtHbk/n3ef2sGVKTwOFua48xB5mQNoQj+c=; h=Cc:Date:From:Reply-To:Subject:To; b=OK/38FGDyYd10b6/gfjFtF/zdbiMQI9W8eKImOMaTO/f2kcJr4cYrCQ22+zGCF7aU4r drB/A1vQKrYdl/XSLVWKMAwQSxgSRuntM5WiyfEVvEjGeg1p8J8Ml9KDk92GYPJxYYwST U51FDLWzQT0N66wcuqObv11cShdt3Zdf4j8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The "arasan" driver now works with the emmc2 device. This means that both the PcdSdIsArasan and the !PcdSdIsArasan result in valid SD controllers on the rpi4. Lets avoid removing the "stale" boot entry, in this case which also has the side effect of avoiding a boot assert when emmc2 is selected. Signed-off-by: Jeremy Linton Reviewed-by: Andrei Warkentin --- Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm= .c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c index fa46be7917..c2fc40b8ea 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c @@ -431,7 +431,7 @@ RemoveStaleBootOptions ( EFI_DEVICE_PATH_PROTOCOL *DevicePath =3D BootOptions[Index].FilePath; =20 if (CompareMem (&mArasan, DevicePath, GetDevicePathSize (DevicePath)) = =3D=3D 0) { - if (PcdGet32 (PcdSdIsArasan)) { + if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL =3D=3D 4) { continue; } } else if (CompareMem (&mSDHost, DevicePath, GetDevicePathSize (Device= Path)) =3D=3D 0) { --=20 2.13.7 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68819): https://edk2.groups.io/g/devel/message/68819 Mute This Topic: https://groups.io/mt/78964896/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-