* [PATCH edk2-platforms v7 0/2] add platform boot options
@ 2018-04-28 5:41 Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 1/2] Platform/HiKey960: register predefined " Haojian Zhuang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Haojian Zhuang @ 2018-04-28 5:41 UTC (permalink / raw)
To: edk2-devel; +Cc: Haojian Zhuang, Laszlo Ersek, Leif Lindholm, Ard Biesheuvel
Changelog:
v7:
* Fix memory leakage on DevicePath.
v6:
* Remove redundant definition -- "GRUB_FILE_NAME".
v5:
* Avoid to merge device path and grub's file path in driver.
Merge them directly in DSC file.
* Avoid duplicated code to create boot options.
* Use goto to handle error condition.
v4:
* Add BootCount parameter in the interface.
v3:
* Move in initilization of boot entry.
* Update the name of interface in platform boot manager protocol.
v2:
* Update with platform boot manager protocol.
Haojian Zhuang (2):
Platform/HiKey960: register predefined boot options
Platform/HiKey: create 4 boot options
Platform/Hisilicon/HiKey/HiKey.dec | 8 +-
Platform/Hisilicon/HiKey/HiKey.dsc | 7 +
Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 163 ++++++++++++++++++++
Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 11 ++
.../{HiKey/HiKey.dec => HiKey960/HiKey960.dec} | 17 +--
Platform/Hisilicon/HiKey960/HiKey960.dsc | 6 +
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 164 +++++++++++++++++++++
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 11 ++
8 files changed, 375 insertions(+), 12 deletions(-)
copy Platform/Hisilicon/{HiKey/HiKey.dec => HiKey960/HiKey960.dec} (56%)
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH edk2-platforms v7 1/2] Platform/HiKey960: register predefined boot options
2018-04-28 5:41 [PATCH edk2-platforms v7 0/2] add platform boot options Haojian Zhuang
@ 2018-04-28 5:41 ` Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 2/2] Platform/HiKey: create 4 " Haojian Zhuang
2018-04-30 9:10 ` [PATCH edk2-platforms v7 0/2] add platform " Laszlo Ersek
2 siblings, 0 replies; 4+ messages in thread
From: Haojian Zhuang @ 2018-04-28 5:41 UTC (permalink / raw)
To: edk2-devel; +Cc: Haojian Zhuang, Laszlo Ersek, Leif Lindholm, Ard Biesheuvel
Create 4 boot options on HiKey960 platform. They're "Boot from SD",
"Grub", "Android Boot" and "Android Fastboot".
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
---
Platform/Hisilicon/HiKey960/HiKey960.dec | 35 +++++
Platform/Hisilicon/HiKey960/HiKey960.dsc | 6 +
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 164 +++++++++++++++++++++
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 11 ++
4 files changed, 216 insertions(+)
create mode 100644 Platform/Hisilicon/HiKey960/HiKey960.dec
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
new file mode 100644
index 000000000000..922d7199c5a5
--- /dev/null
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2018, Linaro Limited. All rights reserved.
+#
+# This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution. The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+
+[Defines]
+ DEC_SPECIFICATION = 0x00010019
+ PACKAGE_NAME = HiKey960
+ PACKAGE_GUID = 1892b5b5-d18d-47a3-8fab-e3ae6b4226b0
+ PACKAGE_VERSION = 0.1
+
+################################################################################
+#
+# Include Section - list of Include Paths that are provided by this package.
+# Comments are used for Keywords and Module Types.
+#
+# Supported Module Types:
+# BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
+#
+################################################################################
+[Guids.common]
+ gHiKey960TokenSpaceGuid = { 0x99a14446, 0xaad7, 0xe460, {0xb4, 0xe5, 0x1f, 0x79, 0xaa, 0xa4, 0x93, 0xfd } }
+
+[PcdsFixedAtBuild.common]
+ gHiKey960TokenSpaceGuid.PcdAndroidBootDevicePath|L""|VOID*|0x00000001
+ gHiKey960TokenSpaceGuid.PcdAndroidBootFile|{ 0x36, 0x8b, 0x73, 0x3a, 0xc5, 0xb9, 0x63, 0x47, 0xab, 0xbd, 0x6c, 0xbd, 0x4b, 0x25, 0xf9, 0xff }|VOID*|0x00000002
+ gHiKey960TokenSpaceGuid.PcdAndroidFastbootFile|{ 0x2a, 0x50, 0x88, 0x95, 0x70, 0x53, 0xe3, 0x11, 0x86, 0x31, 0xd7, 0xc5, 0x95, 0x13, 0x64, 0xc8 }|VOID*|0x00000003
+ gHiKey960TokenSpaceGuid.PcdSdBootDevicePath|L""|VOID*|0x00000004
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index 859ab84f8415..4097fbfd77f5 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)/\\EFI\\BOOT\\GRUBAA64.EFI"
+ 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..b76ac8b571e7 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,8 @@
#define DETECT_SW_FASTBOOT 68 // GPIO8_4
+#define HIKEY960_BOOT_OPTION_NUM 4
+
typedef struct {
UINT64 Magic;
UINT64 Data;
@@ -359,6 +367,152 @@ OnEndOfDxe (
}
}
+STATIC
+EFI_STATUS
+CreatePlatformBootOptionFromPath (
+ IN CHAR16 *PathStr,
+ IN CHAR16 *Description,
+ IN OUT EFI_BOOT_MANAGER_LOAD_OPTION *BootOption
+ )
+{
+ EFI_STATUS Status;
+ EFI_DEVICE_PATH *DevicePath;
+
+ DevicePath = (EFI_DEVICE_PATH *)ConvertTextToDevicePath (PathStr);
+ ASSERT (DevicePath != NULL);
+ Status = EfiBootManagerInitializeLoadOption (
+ BootOption,
+ LoadOptionNumberUnassigned,
+ LoadOptionTypeBoot,
+ LOAD_OPTION_ACTIVE,
+ Description,
+ DevicePath,
+ NULL,
+ 0
+ );
+ FreePool (DevicePath);
+ return Status;
+}
+
+STATIC
+EFI_STATUS
+CreatePlatformBootOptionFromGuid (
+ IN EFI_GUID *FileGuid,
+ IN CHAR16 *Description,
+ IN OUT EFI_BOOT_MANAGER_LOAD_OPTION *BootOption
+ )
+{
+ EFI_STATUS Status;
+ EFI_DEVICE_PATH *DevicePath;
+ EFI_DEVICE_PATH *TempDevicePath;
+ EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
+ MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
+
+ Status = gBS->HandleProtocol (
+ gImageHandle,
+ &gEfiLoadedImageProtocolGuid,
+ (VOID **) &LoadedImage
+ );
+ ASSERT_EFI_ERROR (Status);
+ EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);
+ TempDevicePath = DevicePathFromHandle (LoadedImage->DeviceHandle);
+ ASSERT (TempDevicePath != NULL);
+ DevicePath = AppendDevicePathNode (
+ TempDevicePath,
+ (EFI_DEVICE_PATH_PROTOCOL *) &FileNode
+ );
+ ASSERT (DevicePath != NULL);
+ Status = EfiBootManagerInitializeLoadOption (
+ BootOption,
+ LoadOptionNumberUnassigned,
+ LoadOptionTypeBoot,
+ LOAD_OPTION_ACTIVE,
+ Description,
+ DevicePath,
+ NULL,
+ 0
+ );
+ FreePool (DevicePath);
+ return Status;
+}
+
+STATIC
+EFI_STATUS
+GetPlatformBootOptionsAndKeys (
+ OUT UINTN *BootCount,
+ OUT EFI_BOOT_MANAGER_LOAD_OPTION **BootOptions,
+ OUT EFI_INPUT_KEY **BootKeys
+ )
+{
+ EFI_GUID *FileGuid;
+ CHAR16 *PathStr;
+ EFI_STATUS Status;
+ UINTN Size;
+
+ Size = sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) * HIKEY960_BOOT_OPTION_NUM;
+ *BootOptions = (EFI_BOOT_MANAGER_LOAD_OPTION *)AllocateZeroPool (Size);
+ if (*BootOptions == NULL) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate memory for BootOptions\n"));
+ return EFI_OUT_OF_RESOURCES;
+ }
+ Size = sizeof (EFI_INPUT_KEY) * HIKEY960_BOOT_OPTION_NUM;
+ *BootKeys = (EFI_INPUT_KEY *)AllocateZeroPool (Size);
+ if (*BootKeys == NULL) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate memory for BootKeys\n"));
+ Status = EFI_OUT_OF_RESOURCES;
+ goto Error;
+ }
+
+ PathStr = (CHAR16 *)PcdGetPtr (PcdSdBootDevicePath);
+ ASSERT (PathStr != NULL);
+ Status = CreatePlatformBootOptionFromPath (
+ PathStr,
+ L"Boot from SD",
+ &(*BootOptions)[0]
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ PathStr = (CHAR16 *)PcdGetPtr (PcdAndroidBootDevicePath);
+ ASSERT (PathStr != NULL);
+ Status = CreatePlatformBootOptionFromPath (
+ PathStr,
+ L"Grub",
+ &(*BootOptions)[1]
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ FileGuid = PcdGetPtr (PcdAndroidBootFile);
+ ASSERT (FileGuid != NULL);
+ Status = CreatePlatformBootOptionFromGuid (
+ FileGuid,
+ L"Android Boot",
+ &(*BootOptions)[2]
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ FileGuid = PcdGetPtr (PcdAndroidFastbootFile);
+ ASSERT (FileGuid != NULL);
+ Status = CreatePlatformBootOptionFromGuid (
+ FileGuid,
+ L"Android Fastboot",
+ &(*BootOptions)[3]
+ );
+ ASSERT_EFI_ERROR (Status);
+ (*BootKeys)[3].ScanCode = SCAN_NULL;
+ (*BootKeys)[3].UnicodeChar = 'f';
+
+ *BootCount = 4;
+
+ return EFI_SUCCESS;
+Error:
+ FreePool (*BootOptions);
+ return Status;
+}
+
+PLATFORM_BOOT_MANAGER_PROTOCOL mPlatformBootManager = {
+ GetPlatformBootOptionsAndKeys
+};
+
EFI_STATUS
EFIAPI
VirtualKeyboardRegister (
@@ -487,5 +641,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] 4+ messages in thread
* [PATCH edk2-platforms v7 2/2] Platform/HiKey: create 4 boot options
2018-04-28 5:41 [PATCH edk2-platforms v7 0/2] add platform boot options Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 1/2] Platform/HiKey960: register predefined " Haojian Zhuang
@ 2018-04-28 5:41 ` Haojian Zhuang
2018-04-30 9:10 ` [PATCH edk2-platforms v7 0/2] add platform " Laszlo Ersek
2 siblings, 0 replies; 4+ messages in thread
From: Haojian Zhuang @ 2018-04-28 5:41 UTC (permalink / raw)
To: edk2-devel; +Cc: Haojian Zhuang, Laszlo Ersek, Leif Lindholm, Ard Biesheuvel
Create 4 predefined boot options for HiKey. They're
"Boot from SD", "Grub", "Android Boot" and "Android Fastboot".
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
---
Platform/Hisilicon/HiKey/HiKey.dec | 8 +-
Platform/Hisilicon/HiKey/HiKey.dsc | 7 ++
Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 163 +++++++++++++++++++++++++
Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 11 ++
4 files changed, 186 insertions(+), 3 deletions(-)
diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
index 537138eb45a1..bb94c5cab13f 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dec
+++ b/Platform/Hisilicon/HiKey/HiKey.dec
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
+# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -32,5 +32,7 @@ [Guids.common]
gHiKeyTokenSpaceGuid = { 0x91148425, 0xcdd2, 0x4830, { 0x8b, 0xd0, 0xc6, 0x1c, 0x6d, 0xea, 0x36, 0x21 } }
[PcdsFixedAtBuild.common]
- gHiKeyTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath|L""|VOID*|0x00000001
- gHiKeyTokenSpaceGuid.PcdArmFastbootFlashLimit|L""|VOID*|0x00000002
+ gHiKeyTokenSpaceGuid.PcdAndroidBootDevicePath|L""|VOID*|0x00000001
+ gHiKeyTokenSpaceGuid.PcdAndroidBootFile|{ 0x36, 0x8b, 0x73, 0x3a, 0xc5, 0xb9, 0x63, 0x47, 0xab, 0xbd, 0x6c, 0xbd, 0x4b, 0x25, 0xf9, 0xff }|VOID*|0x00000002
+ gHiKeyTokenSpaceGuid.PcdAndroidFastbootFile|{ 0x2a, 0x50, 0x88, 0x95, 0x70, 0x53, 0xe3, 0x11, 0x86, 0x31, 0xd7, 0xc5, 0x95, 0x13, 0x64, 0xc8 }|VOID*|0x00000003
+ gHiKeyTokenSpaceGuid.PcdSdBootDevicePath|L""|VOID*|0x00000004
diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 83dd68a820b1..9c1fc2e1b40d 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -138,6 +138,13 @@ [PcdsFixedAtBuild.common]
gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbVendorId|0x18d1
gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbProductId|0xd00d
+ #
+ # Android Loader
+ #
+ gHiKeyTokenSpaceGuid.PcdAndroidBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00D023F70000000000)/eMMC(0x0)/Ctrl(0x0)/HD(6,GPT,5C0F213C-17E1-4149-88C8-8B50FB4EC70E,0x7000,0x20000)/\\EFI\\BOOT\\GRUBAA64.EFI"
+ gHiKeyTokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00E023F70000000000)/SD(0x0)"
+
+
################################################################################
#
# Components Section - list of all EDK II Modules needed by this Platform
diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
index 65e800116b76..b847ff8e2e87 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
@@ -18,12 +18,18 @@
#include <Library/DevicePathLib.h>
#include <Library/IoLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/PcdLib.h>
#include <Library/PrintLib.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>
#include <Hi6220.h>
@@ -42,6 +48,7 @@
#define ADB_REBOOT_BOOTLOADER 0x77665500
#define ADB_REBOOT_NONE 0x77665501
+#define HIKEY_BOOT_OPTION_NUM 4
typedef struct {
UINT64 Magic;
@@ -121,6 +128,152 @@ HiKeyInitPeripherals (
return EFI_SUCCESS;
}
+STATIC
+EFI_STATUS
+CreatePlatformBootOptionFromPath (
+ IN CHAR16 *PathStr,
+ IN CHAR16 *Description,
+ IN OUT EFI_BOOT_MANAGER_LOAD_OPTION *BootOption
+ )
+{
+ EFI_STATUS Status;
+ EFI_DEVICE_PATH *DevicePath;
+
+ DevicePath = (EFI_DEVICE_PATH *)ConvertTextToDevicePath (PathStr);
+ ASSERT (DevicePath != NULL);
+ Status = EfiBootManagerInitializeLoadOption (
+ BootOption,
+ LoadOptionNumberUnassigned,
+ LoadOptionTypeBoot,
+ LOAD_OPTION_ACTIVE,
+ Description,
+ DevicePath,
+ NULL,
+ 0
+ );
+ FreePool (DevicePath);
+ return Status;
+}
+
+STATIC
+EFI_STATUS
+CreatePlatformBootOptionFromGuid (
+ IN EFI_GUID *FileGuid,
+ IN CHAR16 *Description,
+ IN OUT EFI_BOOT_MANAGER_LOAD_OPTION *BootOption
+ )
+{
+ EFI_STATUS Status;
+ EFI_DEVICE_PATH *DevicePath;
+ EFI_DEVICE_PATH *TempDevicePath;
+ EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
+ MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
+
+ Status = gBS->HandleProtocol (
+ gImageHandle,
+ &gEfiLoadedImageProtocolGuid,
+ (VOID **) &LoadedImage
+ );
+ ASSERT_EFI_ERROR (Status);
+ EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);
+ TempDevicePath = DevicePathFromHandle (LoadedImage->DeviceHandle);
+ ASSERT (TempDevicePath != NULL);
+ DevicePath = AppendDevicePathNode (
+ TempDevicePath,
+ (EFI_DEVICE_PATH_PROTOCOL *) &FileNode
+ );
+ ASSERT (DevicePath != NULL);
+ Status = EfiBootManagerInitializeLoadOption (
+ BootOption,
+ LoadOptionNumberUnassigned,
+ LoadOptionTypeBoot,
+ LOAD_OPTION_ACTIVE,
+ Description,
+ DevicePath,
+ NULL,
+ 0
+ );
+ FreePool (DevicePath);
+ return Status;
+}
+
+STATIC
+EFI_STATUS
+GetPlatformBootOptionsAndKeys (
+ OUT UINTN *BootCount,
+ OUT EFI_BOOT_MANAGER_LOAD_OPTION **BootOptions,
+ OUT EFI_INPUT_KEY **BootKeys
+ )
+{
+ EFI_GUID *FileGuid;
+ CHAR16 *PathStr;
+ EFI_STATUS Status;
+ UINTN Size;
+
+ Size = sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) * HIKEY_BOOT_OPTION_NUM;
+ *BootOptions = (EFI_BOOT_MANAGER_LOAD_OPTION *)AllocateZeroPool (Size);
+ if (*BootOptions == NULL) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate memory for BootOptions\n"));
+ return EFI_OUT_OF_RESOURCES;
+ }
+ Size = sizeof (EFI_INPUT_KEY) * HIKEY_BOOT_OPTION_NUM;
+ *BootKeys = (EFI_INPUT_KEY *)AllocateZeroPool (Size);
+ if (*BootKeys == NULL) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate memory for BootKeys\n"));
+ Status = EFI_OUT_OF_RESOURCES;
+ goto Error;
+ }
+
+ PathStr = (CHAR16 *)PcdGetPtr (PcdSdBootDevicePath);
+ ASSERT (PathStr != NULL);
+ Status = CreatePlatformBootOptionFromPath (
+ PathStr,
+ L"Boot from SD",
+ &(*BootOptions)[0]
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ PathStr = (CHAR16 *)PcdGetPtr (PcdAndroidBootDevicePath);
+ ASSERT (PathStr != NULL);
+ Status = CreatePlatformBootOptionFromPath (
+ PathStr,
+ L"Grub",
+ &(*BootOptions)[1]
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ FileGuid = PcdGetPtr (PcdAndroidBootFile);
+ ASSERT (FileGuid != NULL);
+ Status = CreatePlatformBootOptionFromGuid (
+ FileGuid,
+ L"Android Boot",
+ &(*BootOptions)[2]
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ FileGuid = PcdGetPtr (PcdAndroidFastbootFile);
+ ASSERT (FileGuid != NULL);
+ Status = CreatePlatformBootOptionFromGuid (
+ FileGuid,
+ L"Android Fastboot",
+ &(*BootOptions)[3]
+ );
+ ASSERT_EFI_ERROR (Status);
+ (*BootKeys)[3].ScanCode = SCAN_NULL;
+ (*BootKeys)[3].UnicodeChar = 'f';
+
+ *BootCount = 4;
+
+ return EFI_SUCCESS;
+Error:
+ FreePool (*BootOptions);
+ return Status;
+}
+
+PLATFORM_BOOT_MANAGER_PROTOCOL mPlatformBootManager = {
+ GetPlatformBootOptionsAndKeys
+};
+
EFI_STATUS
EFIAPI
VirtualKeyboardRegister (
@@ -225,5 +378,15 @@ HiKeyEntryPoint (
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/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
index 702fdb1eebf0..e97afab8785a 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
@@ -27,6 +27,7 @@ [Packages]
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ Platform/Hisilicon/HiKey/HiKey.dec
[LibraryClasses]
BaseMemoryLib
@@ -40,15 +41,25 @@ [LibraryClasses]
PrintLib
SerialPortLib
TimerLib
+ UefiBootManagerLib
UefiBootServicesTableLib
UefiRuntimeServicesTableLib
UefiLib
UefiDriverEntryPoint
[Protocols]
+ gEfiDevicePathFromTextProtocolGuid
+ gEfiLoadedImageProtocolGuid
gEmbeddedGpioProtocolGuid
+ gPlatformBootManagerProtocolGuid
gPlatformVirtualKeyboardProtocolGuid
+[Pcd]
+ gHiKeyTokenSpaceGuid.PcdAndroidBootDevicePath
+ gHiKeyTokenSpaceGuid.PcdAndroidBootFile
+ gHiKeyTokenSpaceGuid.PcdAndroidFastbootFile
+ gHiKeyTokenSpaceGuid.PcdSdBootDevicePath
+
[Guids]
gEfiEndOfDxeEventGroupGuid
gEfiFileInfoGuid
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH edk2-platforms v7 0/2] add platform boot options
2018-04-28 5:41 [PATCH edk2-platforms v7 0/2] add platform boot options Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 1/2] Platform/HiKey960: register predefined " Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 2/2] Platform/HiKey: create 4 " Haojian Zhuang
@ 2018-04-30 9:10 ` Laszlo Ersek
2 siblings, 0 replies; 4+ messages in thread
From: Laszlo Ersek @ 2018-04-30 9:10 UTC (permalink / raw)
To: Haojian Zhuang, edk2-devel; +Cc: Leif Lindholm, Ard Biesheuvel
On 04/28/18 07:41, Haojian Zhuang wrote:
> Changelog:
> v7:
> * Fix memory leakage on DevicePath.
> v6:
> * Remove redundant definition -- "GRUB_FILE_NAME".
> v5:
> * Avoid to merge device path and grub's file path in driver.
> Merge them directly in DSC file.
> * Avoid duplicated code to create boot options.
> * Use goto to handle error condition.
> v4:
> * Add BootCount parameter in the interface.
> v3:
> * Move in initilization of boot entry.
> * Update the name of interface in platform boot manager protocol.
> v2:
> * Update with platform boot manager protocol.
>
> Haojian Zhuang (2):
> Platform/HiKey960: register predefined boot options
> Platform/HiKey: create 4 boot options
>
> Platform/Hisilicon/HiKey/HiKey.dec | 8 +-
> Platform/Hisilicon/HiKey/HiKey.dsc | 7 +
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 163 ++++++++++++++++++++
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 11 ++
> .../{HiKey/HiKey.dec => HiKey960/HiKey960.dec} | 17 +--
> Platform/Hisilicon/HiKey960/HiKey960.dsc | 6 +
> .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 164 +++++++++++++++++++++
> .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 11 ++
> 8 files changed, 375 insertions(+), 12 deletions(-)
> copy Platform/Hisilicon/{HiKey/HiKey.dec => HiKey960/HiKey960.dec} (56%)
>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
series
Acked-by: Laszlo Ersek <lersek@redhat.com>
Thanks
Laszlo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-30 9:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-28 5:41 [PATCH edk2-platforms v7 0/2] add platform boot options Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 1/2] Platform/HiKey960: register predefined " Haojian Zhuang
2018-04-28 5:41 ` [PATCH edk2-platforms v7 2/2] Platform/HiKey: create 4 " Haojian Zhuang
2018-04-30 9:10 ` [PATCH edk2-platforms v7 0/2] add platform " Laszlo Ersek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox