EmbeddedPkg/AndroidFastboot: drop bogus ArmGlobalVariable dependencies

[mirror_edk2.git] / EmbeddedPkg / Application / AndroidFastboot / Arm / BootAndroidBootImg.c

diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 04ad9c05db4b433f33c8db10342528e2d38f0308..acedd3e0e3cdd674a4794ca91f4c6a86abf7bbce 100644 (file)
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2013-2015, ARM Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -18,8 +18,13 @@
 \r
 #include <Library/BdsLib.h>\r
 #include <Library/DevicePathLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiLib.h>\r
 \r
-#include <Guid/ArmGlobalVariableHob.h>\r
+#define LINUX_LOADER_COMMAND_LINE       L"%s -f %s -c %s"\r
+\r
+// This GUID is defined in the INGF file of ArmPkg/Application/LinuxLoader\r
+CONST EFI_GUID mLinuxLoaderAppGuid = { 0x701f54f2, 0x0d70, 0x4b89, { 0xbc, 0x0a, 0xd9, 0xca, 0x25, 0x37, 0x90, 0x59 }};\r
 \r
 // Device Path representing an image in memory\r
 #pragma pack(1)\r
@@ -46,8 +51,7 @@ STATIC CONST MEMORY_DEVICE_PATH MemoryDevicePathTemplate =
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    sizeof (EFI_DEVICE_PATH_PROTOCOL),\r
-    0\r
+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r
   } // End\r
 };\r
 \r
@@ -57,7 +61,6 @@ BootAndroidBootImg (
   IN VOID    *Buffer\r
   )\r
 {\r
-  EFI_DEVICE_PATH_PROTOCOL           *FdtDevicePath;\r
   EFI_STATUS                          Status;\r
   CHAR8                               KernelArgs[BOOTIMG_KERNEL_ARGS_SIZE];\r
   VOID                               *Kernel;\r
@@ -66,6 +69,10 @@ BootAndroidBootImg (
   UINTN                               RamdiskSize;\r
   MEMORY_DEVICE_PATH                  KernelDevicePath;\r
   MEMORY_DEVICE_PATH*                 RamdiskDevicePath;\r
+  CHAR16*                             KernelDevicePathTxt;\r
+  CHAR16*                             RamdiskDevicePathTxt;\r
+  EFI_DEVICE_PATH*                    LinuxLoaderDevicePath;\r
+  CHAR16*                             LoadOptions;\r
 \r
   Status = ParseAndroidBootImg (\r
             Buffer,\r
@@ -94,31 +101,44 @@ BootAndroidBootImg (
     RamdiskDevicePath->Node1.EndingAddress   = ((EFI_PHYSICAL_ADDRESS)(UINTN) Ramdisk) + RamdiskSize;\r
   }\r
 \r
-  // Get the default FDT device path\r
-  Status = GetEnvironmentVariable ((CHAR16 *)L"Fdt", &gArmGlobalVariableGuid,\r
-             NULL, 0, (VOID **)&FdtDevicePath);\r
-  if (Status == EFI_NOT_FOUND) {\r
-    DEBUG ((EFI_D_ERROR, "Error: Please update FDT path in boot manager\n"));\r
+  //\r
+  // Boot Linux using the Legacy Linux Loader\r
+  //\r
+\r
+  Status = LocateEfiApplicationInFvByGuid (&mLinuxLoaderAppGuid, &LinuxLoaderDevicePath);\r
+  if (EFI_ERROR (Status)) {\r
+    Print (L"Couldn't Boot Linux: %d\n", Status);\r
     return EFI_DEVICE_ERROR;\r
   }\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  Status = BdsBootLinuxFdt (\r
-              (EFI_DEVICE_PATH_PROTOCOL *) &KernelDevicePath,\r
-              (EFI_DEVICE_PATH_PROTOCOL *) RamdiskDevicePath,\r
-              KernelArgs,\r
-              FdtDevicePath\r
-              );\r
+\r
+  KernelDevicePathTxt = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL *) &KernelDevicePath, FALSE, FALSE);\r
+  if (KernelDevicePathTxt == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  RamdiskDevicePathTxt = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL *) RamdiskDevicePath, FALSE, FALSE);\r
+  if (RamdiskDevicePathTxt == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  // Initialize Legacy Linux loader command line\r
+  LoadOptions = CatSPrint (NULL, LINUX_LOADER_COMMAND_LINE, KernelDevicePathTxt, RamdiskDevicePathTxt, KernelArgs);\r
+  if (LoadOptions == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  Status = BdsStartEfiApplication (gImageHandle, LinuxLoaderDevicePath, StrSize (LoadOptions), LoadOptions);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "Couldn't Boot Linux: %d\n", Status));\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
   if (RamdiskDevicePath) {\r
+    FreePool (RamdiskDevicePathTxt);\r
     FreePool (RamdiskDevicePath);\r
   }\r
 \r
-  FreePool (FdtDevicePath);\r
+  FreePool (KernelDevicePathTxt);\r
 \r
   // If we got here we do a confused face because BootLinuxFdt returned,\r
   // reporting success.\r