[edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path removal.

[Andrei Warkentin]

LGTM

Reviewed-by: Andrei Warkentin <awarkentin at vmware.com>

________________________________
From: devel at edk2.groups.io <devel at edk2.groups.io> on behalf of Jeremy Linton via groups.io <jeremy.linton=arm.com at groups.io>
Sent: Monday, December 14, 2020 5:23 PM
To: devel at edk2.groups.io <devel at edk2.groups.io>
Cc: ard.biesheuvel at arm.com <ard.biesheuvel at arm.com>; leif at nuviainc.com <leif at nuviainc.com>; pete at akeo.ie <pete at akeo.ie>; andrey.warkentin at gmail.com <andrey.warkentin at gmail.com>; samer.el-haj-mahmoud at arm.com <samer.el-haj-mahmoud at arm.com>; Jeremy Linton <jeremy.linton at arm.com>
Subject: [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path removal.

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 <jeremy.linton at arm.com>
---
 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 = BootOptions[Index].FilePath;



     if (CompareMem (&mArasan, DevicePath, GetDevicePathSize (DevicePath)) == 0) {

-      if (PcdGet32 (PcdSdIsArasan)) {

+      if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL == 4) {

         continue;

       }

     } else if (CompareMem (&mSDHost, DevicePath, GetDevicePathSize (DevicePath)) == 0) {

--
2.13.7



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#68819): https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Fmessage%2F68819&data=04%7C01%7Cawarkentin%40vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=JnEy1ggO05LRNBxNj7EfQRQSKys48mjnVQgPsnTmL4k%3D&reserved=0
Mute This Topic: https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.io%2Fmt%2F78964896%2F4387333&data=04%7C01%7Cawarkentin%40vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=nnW4LmTnA%2BnxaLjhlLlHOiru5Rdx7FQLX1JTSTzDCvQ%3D&reserved=0
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Funsub&data=04%7C01%7Cawarkentin%40vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=evhGhiInBiwlnupjx0eBedSkMzOr5RCpLNyhYLV%2Btro%3D&reserved=0 [awarkentin at vmware.com]
-=-=-=-=-=-=




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#68875): https://edk2.groups.io/g/devel/message/68875
Mute This Topic: https://groups.io/mt/78964896/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20201215/84c67a39/attachment.htm>