diff options
| author | Jeremy Linton <jeremy.linton@arm.com> | 2021-01-08 00:14:11 -0600 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@arm.com> | 2021-01-08 10:43:38 +0100 |
| commit | dcb1fbff08bbd1263e81d862abaf37b2b6ecb98c (patch) | |
| tree | 45fb185668e618570ef1588aac741bb6de401cad | |
| parent | 9dbca4ef914dbf773b4717525164c7126d757258 (diff) | |
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@arm.com>
Reviewed-by: Andrei Warkentin <awarkentin@vmware.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
| -rw-r--r-- | Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c index fa46be79..c2fc40b8 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) {
|