* [edk2-platforms PATCH v2 1/1] Platform/HiKey960: register predefined boot options
@ 2018-04-17 5:14 Haojian Zhuang
2018-04-17 9:27 ` Laszlo Ersek
0 siblings, 1 reply; 2+ messages in thread
From: Haojian Zhuang @ 2018-04-17 5:14 UTC (permalink / raw)
To: edk2-devel; +Cc: Haojian Zhuang, Leif Lindholm, Ard Biesheuvel, Laszlo Ersek
Create 4 boot options on HiKey960 platform. They're "Boot from SD",
"Grub", "Android Boot" and "Android Fastboot".
Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
---
Platform/Hisilicon/HiKey960/HiKey960.dsc | 6 +
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 145 +++++++++++++++++++++
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 11 ++
3 files changed, 162 insertions(+)
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index 859ab84f8415..475d39916262 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -132,6 +132,12 @@ [PcdsFixedAtBuild.common]
gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbVendorId|0x18d1
gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbProductId|0xd00d
+ #
+ # Android Loader
+ #
+ gHiKey960TokenSpaceGuid.PcdAndroidBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00003BFF0000000000)/UFS(0x0,0x3)/HD(7,GPT,D3340696-9B95-4C64-8DF6-E6D4548FBA41,0x12100,0x4000)"
+ gHiKey960TokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00F037FF0000000000)/SD(0x0)"
+
################################################################################
#
# Components Section - list of all EDK II Modules needed by this Platform
diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
index 473d61ed384e..84bd76b5cae9 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
@@ -30,10 +30,16 @@
#include <Library/PrintLib.h>
#include <Library/SerialPortLib.h>
#include <Library/TimerLib.h>
+#include <Library/UefiBootManagerLib.h>
#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Protocol/DevicePath.h>
+#include <Protocol/DevicePathFromText.h>
#include <Protocol/EmbeddedGpio.h>
+#include <Protocol/LoadedImage.h>
+#include <Protocol/PlatformBootManager.h>
#include <Protocol/PlatformVirtualKeyboard.h>
#define ADC_ADCIN0 0
@@ -86,6 +92,10 @@
#define DETECT_SW_FASTBOOT 68 // GPIO8_4
+#define HIKEY960_BOOT_OPTION_NUM 4
+
+#define GRUB_FILE_NAME L"\\EFI\\BOOT\\GRUBAA64.EFI"
+
typedef struct {
UINT64 Magic;
UINT64 Data;
@@ -359,6 +369,131 @@ OnEndOfDxe (
}
}
+STATIC
+EFI_STATUS
+RegisterPlatformBootOptions (
+ OUT EFI_BOOT_MANAGER_LOAD_OPTION **BootOptions,
+ OUT EFI_INPUT_KEY **BootKeys
+ )
+{
+ EFI_BOOT_MANAGER_LOAD_OPTION *Option;
+ EFI_INPUT_KEY *Key;
+ EFI_DEVICE_PATH *DevicePath;
+ EFI_DEVICE_PATH *FileDevicePath;
+ EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *DPProtocol;
+ FILEPATH_DEVICE_PATH *FilePath;
+ EFI_GUID *FileGuid;
+ EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
+ MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
+ CHAR16 *PathStr;
+ EFI_STATUS Status;
+ UINTN Size;
+
+ if ((BootOptions == NULL) || (BootKeys == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+ // Leave the last entry as empty
+ Size = sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) * (HIKEY960_BOOT_OPTION_NUM + 1);
+ *BootOptions = (EFI_BOOT_MANAGER_LOAD_OPTION *)AllocateZeroPool (Size);
+ if (*BootOptions == NULL) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate memory for BootOptions\n"));
+ return EFI_BUFFER_TOO_SMALL;
+ }
+ // Leave the last entry as empty
+ Size = sizeof (EFI_INPUT_KEY) * (HIKEY960_BOOT_OPTION_NUM + 1);
+ *BootKeys = (EFI_INPUT_KEY *)AllocateZeroPool (Size);
+ if (*BootKeys == NULL) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate memory for BootKeys\n"));
+ FreePool (*BootOptions);
+ return EFI_BUFFER_TOO_SMALL;
+ }
+ Option = *BootOptions;
+ Key = *BootKeys;
+
+ Option[0].Description = L"Boot from SD";
+ PathStr = (CHAR16 *)PcdGetPtr (PcdSdBootDevicePath);
+ ASSERT (PathStr != NULL);
+ Status = gBS->LocateProtocol (&gEfiDevicePathFromTextProtocolGuid,
+ NULL,
+ (VOID **)&DPProtocol
+ );
+ ASSERT_EFI_ERROR (Status);
+ DevicePath = (EFI_DEVICE_PATH *)DPProtocol->ConvertTextToDevicePath (PathStr);
+ ASSERT (DevicePath != NULL);
+ Option[0].FilePath = DevicePath;
+
+ Option[1].Description = L"Grub";
+ PathStr = (CHAR16 *)PcdGetPtr (PcdAndroidBootDevicePath);
+ ASSERT (PathStr != NULL);
+ Status = gBS->LocateProtocol (&gEfiDevicePathFromTextProtocolGuid,
+ NULL,
+ (VOID **)&DPProtocol
+ );
+ ASSERT_EFI_ERROR (Status);
+ DevicePath = (EFI_DEVICE_PATH *)DPProtocol->ConvertTextToDevicePath (PathStr);
+ ASSERT (DevicePath != NULL);
+ Size = StrSize (GRUB_FILE_NAME);
+ FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + END_DEVICE_PATH_LENGTH);
+ if (FileDevicePath != NULL) {
+ FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;
+ FilePath->Header.Type = MEDIA_DEVICE_PATH;
+ FilePath->Header.SubType = MEDIA_FILEPATH_DP;
+ CopyMem (&FilePath->PathName, GRUB_FILE_NAME, Size);
+ SetDevicePathNodeLength (&FilePath->Header, Size + SIZE_OF_FILEPATH_DEVICE_PATH);
+ SetDevicePathEndNode (NextDevicePathNode (&FilePath->Header));
+
+ DevicePath = AppendDevicePath (DevicePath, FileDevicePath);
+ FreePool (FileDevicePath);
+ }
+ Option[1].FilePath = DevicePath;
+
+ Option[2].Description = L"Android Boot";
+ FileGuid = PcdGetPtr (PcdAndroidBootFile);
+ ASSERT (FileGuid != NULL);
+ Status = gBS->HandleProtocol (
+ gImageHandle,
+ &gEfiLoadedImageProtocolGuid,
+ (VOID **) &LoadedImage
+ );
+ ASSERT_EFI_ERROR (Status);
+ EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);
+ DevicePath = DevicePathFromHandle (LoadedImage->DeviceHandle);
+ ASSERT (DevicePath != NULL);
+ DevicePath = AppendDevicePathNode (
+ DevicePath,
+ (EFI_DEVICE_PATH_PROTOCOL *) &FileNode
+ );
+ ASSERT (DevicePath != NULL);
+ Option[2].FilePath = DevicePath;
+
+ Option[3].Description = L"Android Fastboot";
+ FileGuid = PcdGetPtr (PcdAndroidFastbootFile);
+ ASSERT (FileGuid != NULL);
+ Status = gBS->HandleProtocol (
+ gImageHandle,
+ &gEfiLoadedImageProtocolGuid,
+ (VOID **) &LoadedImage
+ );
+ ASSERT_EFI_ERROR (Status);
+ EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);
+ DevicePath = DevicePathFromHandle (LoadedImage->DeviceHandle);
+ ASSERT (DevicePath != NULL);
+ DevicePath = AppendDevicePathNode (
+ DevicePath,
+ (EFI_DEVICE_PATH_PROTOCOL *) &FileNode
+ );
+ ASSERT (DevicePath != NULL);
+ Option[3].FilePath = DevicePath;
+ Key[3].ScanCode = SCAN_NULL;
+ Key[3].UnicodeChar = 'f';
+
+ return EFI_SUCCESS;
+}
+
+PLATFORM_BOOT_MANAGER_PROTOCOL mPlatformBootManager = {
+ RegisterPlatformBootOptions
+};
+
EFI_STATUS
EFIAPI
VirtualKeyboardRegister (
@@ -487,5 +622,15 @@ HiKey960EntryPoint (
EFI_NATIVE_INTERFACE,
&mVirtualKeyboard
);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ Status = gBS->InstallProtocolInterface (
+ &ImageHandle,
+ &gPlatformBootManagerProtocolGuid,
+ EFI_NATIVE_INTERFACE,
+ &mPlatformBootManager
+ );
return Status;
}
diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
index cc517656b340..5adedd79d3e8 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
@@ -25,6 +25,7 @@ [Packages]
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ Platform/Hisilicon/HiKey960/HiKey960.dec
[LibraryClasses]
BaseMemoryLib
@@ -37,15 +38,25 @@ [LibraryClasses]
PrintLib
SerialPortLib
TimerLib
+ UefiBootManagerLib
UefiBootServicesTableLib
UefiDriverEntryPoint
UefiLib
UefiRuntimeServicesTableLib
[Protocols]
+ gEfiDevicePathFromTextProtocolGuid
+ gEfiLoadedImageProtocolGuid
gEmbeddedGpioProtocolGuid
+ gPlatformBootManagerProtocolGuid
gPlatformVirtualKeyboardProtocolGuid
+[Pcd]
+ gHiKey960TokenSpaceGuid.PcdAndroidBootDevicePath
+ gHiKey960TokenSpaceGuid.PcdAndroidBootFile
+ gHiKey960TokenSpaceGuid.PcdAndroidFastbootFile
+ gHiKey960TokenSpaceGuid.PcdSdBootDevicePath
+
[Guids]
gEfiEndOfDxeEventGroupGuid
gEfiFileInfoGuid
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [edk2-platforms PATCH v2 1/1] Platform/HiKey960: register predefined boot options
2018-04-17 5:14 [edk2-platforms PATCH v2 1/1] Platform/HiKey960: register predefined boot options Haojian Zhuang
@ 2018-04-17 9:27 ` Laszlo Ersek
0 siblings, 0 replies; 2+ messages in thread
From: Laszlo Ersek @ 2018-04-17 9:27 UTC (permalink / raw)
To: Haojian Zhuang, edk2-devel; +Cc: Leif Lindholm, Ard Biesheuvel
On 04/17/18 07:14, Haojian Zhuang wrote:
> Create 4 boot options on HiKey960 platform. They're "Boot from SD",
> "Grub", "Android Boot" and "Android Fastboot".
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
> ---
> Platform/Hisilicon/HiKey960/HiKey960.dsc | 6 +
> .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 145 +++++++++++++++++++++
> .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 11 ++
> 3 files changed, 162 insertions(+)
I'll check the next version of this patch, when it's updated to my
comments for the prerequisite PLATFORM_BOOT_MANAGER_PROTOCOL patch.
Thanks
Laszlo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-17 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-17 5:14 [edk2-platforms PATCH v2 1/1] Platform/HiKey960: register predefined boot options Haojian Zhuang
2018-04-17 9:27 ` Laszlo Ersek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox