@@ -16,7 +16,6 @@
#include <ArmPlatform.h>
#include <IndustryStandard/Pci.h>
-#include <Protocol/DevicePathFromText.h>
#include <Protocol/PciIo.h>
#include <Protocol/PciRootBridgeIo.h>
@@ -414,9 +413,6 @@ ArmJunoEntryPoint (
{
EFI_STATUS Status;
EFI_PHYSICAL_ADDRESS HypBase;
- CHAR16 *TextDevicePath;
- UINTN TextDevicePathSize;
- VOID *Buffer;
UINT32 JunoRevision;
EFI_EVENT EndOfDxeEvent;
@@ -530,25 +526,5 @@ ArmJunoEntryPoint (
);
}
- //
- // Set up the device path to the FDT.
- //
- TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoFdtDevicePath);
- if (TextDevicePath != NULL) {
- TextDevicePathSize = StrSize (TextDevicePath);
- Buffer = PcdSetPtr (PcdFdtDevicePaths, &TextDevicePathSize, TextDevicePath);
- Status = (Buffer != NULL) ? EFI_SUCCESS : EFI_BUFFER_TOO_SMALL;
- } else {
- Status = EFI_NOT_FOUND;
- }
-
- if (EFI_ERROR (Status)) {
- DEBUG (
- (EFI_D_ERROR,
- "ArmJunoDxe: Setting of FDT device path in PcdFdtDevicePaths failed - %r\n", Status)
- );
- return Status;
- }
-
- return Status;
+ return EFI_SUCCESS;
}
@@ -82,7 +82,6 @@ [FixedPcd]
gArmTokenSpaceGuid.PcdPciBusMax
[Pcd]
- gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
[Depex]
Change ArmJunoDxe to be compatible with the new DtPlatformDxe driver, which simply selects one of three embedded DTB binaries based on the current hardware. It also introduces a config screen in the UEFI setup menu that allows either ACPI or DT to be selected (but not both) For this module, it simply means we remove all FDT handling, given that this is now the job of another module. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 26 +------------------- ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 1 - 2 files changed, 1 insertion(+), 26 deletions(-) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel