From: Haojian Zhuang <haojian.zhuang@linaro.org>
To: edk2-devel@lists.01.org
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>,
Laszlo Ersek <lersek@redhat.com>,
Leif Lindholm <leif.lindholm@linaro.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-platforms v6 1/2] Platform/HiKey960: register predefined boot options
Date: Thu, 26 Apr 2018 11:30:33 +0800 [thread overview]
Message-ID: <1524713434-9553-2-git-send-email-haojian.zhuang@linaro.org> (raw)
In-Reply-To: <1524713434-9553-1-git-send-email-haojian.zhuang@linaro.org>
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>
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 | 170 +++++++++++++++++++++
.../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 11 ++
4 files changed, 222 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..b6a88daf4f99 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,158 @@ 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
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+ 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
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+ 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 +647,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
next prev parent reply other threads:[~2018-04-26 3:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 3:30 [PATCH edk2-platforms v6 0/2] add platform boot options Haojian Zhuang
2018-04-26 3:30 ` Haojian Zhuang [this message]
2018-04-26 3:30 ` [PATCH edk2-platforms v6 2/2] Platform/HiKey: create 4 " Haojian Zhuang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1524713434-9553-2-git-send-email-haojian.zhuang@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox