<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div style="font-family: Consolas, Courier, monospace; font-size: 12pt; color: rgb(0, 0, 0);"> <div style="margin:0px;font-size:12pt"><span style="margin:0px">LGTM</span><br> </div> <div style="margin:0px;font-size:12pt"><br> </div> <div style="margin:0px;font-size:12pt">Reviewed-by: Andrei Warkentin <awarkentin@vmware.com></div> <br> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Jeremy Linton via groups.io <jeremy.linton=arm.com@groups.io><br> <b>Sent:</b> Monday, December 14, 2020 5:23 PM<br> <b>To:</b> devel@edk2.groups.io <devel@edk2.groups.io><br> <b>Cc:</b> ard.biesheuvel@arm.com <ard.biesheuvel@arm.com>; leif@nuviainc.com <leif@nuviainc.com>; pete@akeo.ie <pete@akeo.ie>; andrey.warkentin@gmail.com <andrey.warkentin@gmail.com>; samer.el-haj-mahmoud@arm.com <samer.el-haj-mahmoud@arm.com>; Jeremy Linton <jeremy.linton@arm.com><br> <b>Subject:</b> [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path removal.</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt;"> <div class="PlainText">The "arasan" driver now works with the emmc2 device.<br> This means that both the PcdSdIsArasan and the<br> !PcdSdIsArasan result in valid SD controllers on the rpi4.<br> <br> Lets avoid removing the "stale" boot entry, in this case<br> which also has the side effect of avoiding a boot assert<br> when emmc2 is selected.<br> <br> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com><br> ---<br> Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 2 +-<br> 1 file changed, 1 insertion(+), 1 deletion(-)<br> <br> diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c<br> index fa46be7917..c2fc40b8ea 100644<br> --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c<br> +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c<br> @@ -431,7 +431,7 @@ RemoveStaleBootOptions (<br> EFI_DEVICE_PATH_PROTOCOL *DevicePath = BootOptions[Index].FilePath;<br> <br> <br> <br> if (CompareMem (&mArasan, DevicePath, GetDevicePathSize (DevicePath)) == 0) {<br> <br> - if (PcdGet32 (PcdSdIsArasan)) {<br> <br> + if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL == 4) {<br> <br> continue;<br> <br> }<br> <br> } else if (CompareMem (&mSDHost, DevicePath, GetDevicePathSize (DevicePath)) == 0) {<br> <br> -- <br> 2.13.7<br> <br> <br> <br> -=-=-=-=-=-=<br> Groups.io Links: You receive all messages sent to this group.<br> View/Reply Online (#68819): <a href="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"> 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</a><br> Mute This Topic: <a href="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"> 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</a><br> Group Owner: devel+owner@edk2.groups.io<br> Unsubscribe: <a href="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"> 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</a> [awarkentin@vmware.com]<br> -=-=-=-=-=-=<br> <br> <br> </div> </span></font></div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links:<p> You receive all messages sent to this group. <p> <a target="_blank" href="https://edk2.groups.io/g/devel/message/68875">View/Reply Online (#68875)</a> | | <a target="_blank" href="https://groups.io/mt/78964896/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a><br> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com]<br> <div width="1" style="color:white;clear:both">_._,_._,_</div>