diff options
author | Ronald Cron <Ronald.Cron@arm.com> | 2015-02-26 11:02:39 +0000 |
---|---|---|
committer | oliviermartin <oliviermartin@Edk2> | 2015-02-26 11:02:39 +0000 |
commit | 6332ffb0affadde53e45325d81b084bc9936ef02 (patch) | |
tree | 553fcbe92b3d80b31e11b68c41e864feeb3bbc47 /EmbeddedPkg | |
parent | 7aec2926b926ad90d09fb026af0ee04c4c831237 (diff) | |
download | edk2-platforms-6332ffb0affadde53e45325d81b084bc9936ef02.tar.xz |
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
Diffstat (limited to 'EmbeddedPkg')
-rw-r--r-- | EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c index d4e1904d7d..7e9ad880ba 100644 --- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c +++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c @@ -56,7 +56,6 @@ BootAndroidBootImg ( IN VOID *Buffer
)
{
- EFI_DEVICE_PATH_PROTOCOL *FdtDevicePath;
EFI_STATUS Status;
CHAR8 KernelArgs[BOOTIMG_KERNEL_ARGS_SIZE];
VOID *Kernel;
@@ -93,20 +92,10 @@ BootAndroidBootImg ( RamdiskDevicePath->Node1.EndingAddress = ((EFI_PHYSICAL_ADDRESS)(UINTN) Ramdisk) + RamdiskSize;
}
- // Get the default FDT device path
- Status = GetEnvironmentVariable ((CHAR16 *)L"Fdt", &gArmGlobalVariableGuid,
- NULL, 0, (VOID **)&FdtDevicePath);
- if (Status == EFI_NOT_FOUND) {
- DEBUG ((EFI_D_ERROR, "Error: Please update FDT path in boot manager\n"));
- return EFI_DEVICE_ERROR;
- }
- ASSERT_EFI_ERROR (Status);
-
Status = BdsBootLinuxFdt (
(EFI_DEVICE_PATH_PROTOCOL *) &KernelDevicePath,
(EFI_DEVICE_PATH_PROTOCOL *) RamdiskDevicePath,
- KernelArgs,
- FdtDevicePath
+ KernelArgs
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Couldn't Boot Linux: %d\n", Status));
@@ -117,8 +106,6 @@ BootAndroidBootImg ( FreePool (RamdiskDevicePath);
}
- FreePool (FdtDevicePath);
-
// If we got here we do a confused face because BootLinuxFdt returned,
// reporting success.
DEBUG ((EFI_D_ERROR, "WARNING: BdsBootLinuxFdt returned EFI_SUCCESS.\n"));
|