ArmPlatformPkg/Bds: Remove any use of the "Fdt" UEFI variable

Remove the option to update the "Fdt" UEFI variable in the ARM BDS as
the "setfdt" EFI Shell command provides this service from now.

Remove the use of this variable in the legacy kernel boot loader and
use the FDT installed in the configuration table instead.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <Ronald.Cron@arm.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16940 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 5 insertions, 82 deletions

diff --git a/ArmPlatformPkg/Bds/Bds.inf b/ArmPlatformPkg/Bds/Bds.inf
index 190bbc9975..d49b0efdcb 100644
--- a/ArmPlatformPkg/Bds/Bds.inf
+++ b/ArmPlatformPkg/Bds/Bds.inf
@@ -73,7 +73,6 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath

   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument

   gArmPlatformTokenSpaceGuid.PcdDefaultBootType

-  gArmPlatformTokenSpaceGuid.PcdFdtDevicePath

   gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index 04a2eee6f5..76c66fd0bb 100644
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -824,63 +824,6 @@ ErrorExit:
   return Status ;

 }

 

-EFI_STATUS

-UpdateFdtPath (

-  IN LIST_ENTRY *BootOptionsList

-  )

-{

-  EFI_STATUS                Status;

-  UINTN                     FdtDevicePathSize;

-  BDS_SUPPORTED_DEVICE      *SupportedBootDevice;

-  EFI_DEVICE_PATH_PROTOCOL  *FdtDevicePathNodes;

-  EFI_DEVICE_PATH_PROTOCOL  *FdtDevicePath;

-

-  Status = SelectBootDevice (&SupportedBootDevice);

-  if (EFI_ERROR(Status)) {

-    Status = EFI_ABORTED;

-    goto EXIT;

-  }

-

-  // Create the specific device path node

-  Status = SupportedBootDevice->Support->CreateDevicePathNode (L"FDT blob", &FdtDevicePathNodes);

-  if (EFI_ERROR(Status)) {

-    Status = EFI_ABORTED;

-    goto EXIT;

-  }

-

-  if (FdtDevicePathNodes != NULL) {

-    // Append the Device Path node to the select device path

-    FdtDevicePath = AppendDevicePath (SupportedBootDevice->DevicePathProtocol, FdtDevicePathNodes);

-    // Free the FdtDevicePathNodes created by Support->CreateDevicePathNode()

-    FreePool (FdtDevicePathNodes);

-    FdtDevicePathSize = GetDevicePathSize (FdtDevicePath);

-    Status = gRT->SetVariable (

-                    (CHAR16*)L"Fdt",

-                    &gArmGlobalVariableGuid,

-                    EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-                    FdtDevicePathSize,

-                    FdtDevicePath

-                    );

-    ASSERT_EFI_ERROR(Status);

-  } else {

-    Status = gRT->SetVariable (

-           (CHAR16*)L"Fdt",

-           &gArmGlobalVariableGuid,

-           EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-           0,

-           NULL

-           );

-    ASSERT_EFI_ERROR(Status);

-  }

-

-EXIT:

-  if (Status == EFI_ABORTED) {

-    Print(L"\n");

-  }

-  FreePool(SupportedBootDevice);

-  return Status;

-}

-

 /**

   Set boot timeout

 

@@ -937,7 +880,6 @@ struct BOOT_MANAGER_ENTRY {
     { L"Update Boot Device Entry", BootMenuUpdateBootOption },

     { L"Remove Boot Device Entry", BootMenuRemoveBootOption },

     { L"Reorder Boot Device Entries", BootMenuReorderBootOptions },

-    { L"Update FDT path", UpdateFdtPath },

     { L"Set Boot Timeout", BootMenuSetBootTimeout },

 };

 

diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c
index 80982222e1..889040e3b6 100644
--- a/ArmPlatformPkg/Bds/BootOption.c
+++ b/ArmPlatformPkg/Bds/BootOption.c
@@ -21,13 +21,9 @@ BootOptionStart (
   )

 {

   EFI_STATUS                            Status;

-  EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL*   EfiDevicePathFromTextProtocol;

   UINT32                                LoaderType;

   ARM_BDS_LOADER_OPTIONAL_DATA*         OptionalData;

   ARM_BDS_LINUX_ARGUMENTS*              LinuxArguments;

-  EFI_DEVICE_PATH_PROTOCOL*             FdtDevicePath;

-  EFI_DEVICE_PATH_PROTOCOL*             DefaultFdtDevicePath;

-  UINTN                                 FdtDevicePathSize;

   UINTN                                 CmdLineSize;

   UINTN                                 InitrdSize;

   EFI_DEVICE_PATH*                      Initrd;

@@ -69,25 +65,11 @@ BootOptionStart (
       } else {

         Initrd = NULL;

       }

-

-      // Get the default FDT device path

-      Status = gBS->LocateProtocol (&gEfiDevicePathFromTextProtocolGuid, NULL, (VOID **)&EfiDevicePathFromTextProtocol);

-      ASSERT_EFI_ERROR(Status);

-      DefaultFdtDevicePath = EfiDevicePathFromTextProtocol->ConvertTextToDevicePath ((CHAR16*)PcdGetPtr(PcdFdtDevicePath));

-

-      // Get the FDT device path

-      FdtDevicePathSize = GetDevicePathSize (DefaultFdtDevicePath);

-      Status = GetEnvironmentVariable ((CHAR16 *)L"Fdt", &gArmGlobalVariableGuid,

-                 DefaultFdtDevicePath, &FdtDevicePathSize, (VOID **)&FdtDevicePath);

-      ASSERT_EFI_ERROR(Status);

-

-      Status = BdsBootLinuxFdt (BootOption->FilePathList,

-                                Initrd, // Initrd

-                                (CHAR8*)(LinuxArguments + 1),

-                                FdtDevicePath);

-

-      FreePool (DefaultFdtDevicePath);

-      FreePool (FdtDevicePath);

+      Status = BdsBootLinuxFdt (

+                 BootOption->FilePathList,

+                 Initrd,

+                 (CHAR8*)(LinuxArguments + 1)

+                 );

     }

   } else {

     // Connect all the drivers if the EFI Application is not a EFI OS Loader