Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi: adjust ebbr to v2.1 in conformance profile

Browse source 
The EFI Conformance Profile Table entry for EBBR appears in v2.1.0 of the
EBBR specification[1]. Update naming accordingly.

While at it, update the EBBR version referenced in the documentation.

[1]: https://github.com/ARM-software/ebbr/releases/tag/v2.1.0

Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Vincent Stehlé 2022-12-16 17:55:04 +01:00 committed by Heinrich Schuchardt
parent e7d962bc3c
commit 63db1561f1
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/develop/uefi/uefi.rst
View file

@ -14,7 +14,7 @@ Development target
------------------ ------------------
The implementation of UEFI in U-Boot strives to reach the requirements described The implementation of UEFI in U-Boot strives to reach the requirements described
in the "Embedded Base Boot Requirements (EBBR) Specification - Release v1.0" in the "Embedded Base Boot Requirements (EBBR) Specification - Release v2.1.0"
[2]. The "Server Base Boot Requirements System Software on ARM Platforms" [3] [2]. The "Server Base Boot Requirements System Software on ARM Platforms" [3]
describes a superset of the EBBR specification and may be used as further describes a superset of the EBBR specification and may be used as further
reference. reference.
@ -799,8 +799,8 @@ Links
----- -----
* [1] http://uefi.org/specifications - UEFI specifications * [1] http://uefi.org/specifications - UEFI specifications
* [2] https://github.com/ARM-software/ebbr/releases/download/v1.0/ebbr-v1.0.pdf - * [2] https://github.com/ARM-software/ebbr/releases/download/v2.1.0/ebbr-v2.1.0.pdf -
Embedded Base Boot Requirements (EBBR) Specification - Release v1.0 Embedded Base Boot Requirements (EBBR) Specification - Release v2.1.0
* [3] https://developer.arm.com/docs/den0044/latest/server-base-boot-requirements-system-software-on-arm-platforms-version-11 - * [3] https://developer.arm.com/docs/den0044/latest/server-base-boot-requirements-system-software-on-arm-platforms-version-11 -
Server Base Boot Requirements System Software on ARM Platforms - Version 1.1 Server Base Boot Requirements System Software on ARM Platforms - Version 1.1
* [4] :doc:`iscsi` * [4] :doc:`iscsi`

2
include/efi_api.h
View file

@ -232,7 +232,7 @@ enum efi_reset_type {
#define EFI_CONFORMANCE_PROFILES_TABLE_VERSION 1 #define EFI_CONFORMANCE_PROFILES_TABLE_VERSION 1
#define EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID \ #define EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID \
EFI_GUID(0xcce33c35, 0x74ac, 0x4087, 0xbc, 0xe7, \ EFI_GUID(0xcce33c35, 0x74ac, 0x4087, 0xbc, 0xe7, \
0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27) 0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27)

6
lib/efi_loader/Kconfig
View file

@ -384,8 +384,8 @@ config EFI_ECPT
help help
Enabling this option created the ECPT UEFI table. Enabling this option created the ECPT UEFI table.
config EFI_EBBR_2_0_CONFORMANCE config EFI_EBBR_2_1_CONFORMANCE
bool "Add the EBBRv2.0 conformance entry to the ECPT table" bool "Add the EBBRv2.1 conformance entry to the ECPT table"
depends on EFI_ECPT depends on EFI_ECPT
depends on EFI_LOADER_HII depends on EFI_LOADER_HII
depends on EFI_RISCV_BOOT_PROTOCOL || !RISCV depends on EFI_RISCV_BOOT_PROTOCOL || !RISCV
@ -393,7 +393,7 @@ config EFI_EBBR_2_0_CONFORMANCE
depends on EFI_UNICODE_COLLATION_PROTOCOL2 depends on EFI_UNICODE_COLLATION_PROTOCOL2
default y default y
help help
Enabling this option adds the EBBRv2.0 conformance entry to the ECPT UEFI table. Enabling this option adds the EBBRv2.1 conformance entry to the ECPT UEFI table.
config EFI_RISCV_BOOT_PROTOCOL config EFI_RISCV_BOOT_PROTOCOL
bool "RISCV_EFI_BOOT_PROTOCOL support" bool "RISCV_EFI_BOOT_PROTOCOL support"

8
lib/efi_loader/efi_conformance.c
View file

@ -12,8 +12,8 @@
#include <malloc.h> #include <malloc.h>
static const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID; static const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID;
static const efi_guid_t efi_ebbr_2_0_guid = static const efi_guid_t efi_ebbr_2_1_guid =
EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID; EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID;
/** /**
* efi_ecpt_register() - Install the ECPT system table. * efi_ecpt_register() - Install the ECPT system table.
@ -38,9 +38,9 @@ efi_status_t efi_ecpt_register(void)
return ret; return ret;
} }
if (CONFIG_IS_ENABLED(EFI_EBBR_2_0_CONFORMANCE)) if (CONFIG_IS_ENABLED(EFI_EBBR_2_1_CONFORMANCE))
guidcpy(&ecpt->conformance_profiles[num_entries++], guidcpy(&ecpt->conformance_profiles[num_entries++],
&efi_ebbr_2_0_guid); &efi_ebbr_2_1_guid);
ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION; ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION;
ecpt->number_of_profiles = num_entries; ecpt->number_of_profiles = num_entries;

6
lib/efi_selftest/efi_selftest_ecpt.c
View file

@ -10,7 +10,7 @@
#include <efi_selftest.h> #include <efi_selftest.h>
static const efi_guid_t guid_ecpt = EFI_CONFORMANCE_PROFILES_TABLE_GUID; static const efi_guid_t guid_ecpt = EFI_CONFORMANCE_PROFILES_TABLE_GUID;
static const efi_guid_t guid_ebbr_2_0 = EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID; static const efi_guid_t guid_ebbr_2_1 = EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID;
/* /*
* ecpt_find_guid() - find GUID in EFI Conformance Profile Table * ecpt_find_guid() - find GUID in EFI Conformance Profile Table
@ -53,9 +53,9 @@ static int execute(void)
return EFI_ST_FAILURE; return EFI_ST_FAILURE;
} }
if (CONFIG_IS_ENABLED(EFI_EBBR_2_0_CONFORMANCE)) { if (CONFIG_IS_ENABLED(EFI_EBBR_2_1_CONFORMANCE)) {
++expected_entries; ++expected_entries;
if (ecpt_find_guid(ecpt, &guid_ebbr_2_0)) if (ecpt_find_guid(ecpt, &guid_ebbr_2_1))
return EFI_ST_FAILURE; return EFI_ST_FAILURE;
} }