From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.17290.1609781877318043635 for ; Mon, 04 Jan 2021 09:37:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jeremy.linton@arm.com) 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 0F8CE12FC; Mon, 4 Jan 2021 09:37:57 -0800 (PST) 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 F41A83F66E; Mon, 4 Jan 2021 09:37:56 -0800 (PST) From: "Jeremy Linton" To: devel@edk2.groups.io Cc: ard.biesheuvel@arm.com, leif@nuviainc.com, pete@akeo.ie, samer.el-haj-mahmoud@arm.com, Jeremy Linton , Andrei Warkentin Subject: [PATCH v3 7/7] Platform/RaspberryPi: Correct device path removal. Date: Mon, 4 Jan 2021 11:37:31 -0600 Message-Id: <20210104173731.1413044-8-jeremy.linton@arm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210104173731.1413044-1-jeremy.linton@arm.com> References: <20210104173731.1413044-1-jeremy.linton@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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;= =0D =0D if (CompareMem (&mArasan, DevicePath, GetDevicePathSize (DevicePath)) = =3D=3D 0) {=0D - if (PcdGet32 (PcdSdIsArasan)) {=0D + if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL =3D=3D 4) {=0D continue;=0D }=0D } else if (CompareMem (&mSDHost, DevicePath, GetDevicePathSize (Device= Path)) =3D=3D 0) {=0D --=20 2.13.7