Am 16. Dezember 2022 16:55:04 GMT+00:00 schrieb "Vincent Stehlé" vincent.stehle@arm.com:

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.

Signed-off-by: Vincent Stehlé vincent.stehle@arm.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Ilias Apalodimas ilias.apalodimas@linaro.org

---

doc/develop/uefi/uefi.rst | 6 +++--- include/efi_api.h | 2 +- lib/efi_loader/Kconfig | 6 +++--- lib/efi_loader/efi_conformance.c | 8 ++++---- lib/efi_selftest/efi_selftest_ecpt.c | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index e0835beba41..a944c0fb803 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -14,7 +14,7 @@ Development target

---

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] describes a superset of the EBBR specification and may be used as further reference. @@ -799,8 +799,8 @@ Links

---

• [1] http://uefi.org/specifications - UEFI specifications

-* [2] https://github.com/ARM-software/ebbr/releases/download/v1.0/ebbr-v1.0.pdf -

• Embedded Base Boot Requirements (EBBR) Specification - Release v1.0

+* [2] https://github.com/ARM-software/ebbr/releases/download/v2.1.0/ebbr-v2.1.0.pd... -

• Embedded Base Boot Requirements (EBBR) Specification - Release v2.1.0

• [3] https://developer.arm.com/docs/den0044/latest/server-base-boot-requirements-... - Server Base Boot Requirements System Software on ARM Platforms - Version 1.1
• [4] :doc:`iscsi`

diff --git a/include/efi_api.h b/include/efi_api.h index 9bb0d44ac8d..00c98e0984d 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -232,7 +232,7 @@ enum efi_reset_type {

#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, \ 0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27)

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index e2b643871bf..b498c72206f 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -384,8 +384,8 @@ config EFI_ECPT help Enabling this option created the ECPT UEFI table.

-config EFI_EBBR_2_0_CONFORMANCE

• bool "Add the EBBRv2.0 conformance entry to the ECPT table"

+config EFI_EBBR_2_1_CONFORMANCE

• bool "Add the EBBRv2.1 conformance entry to the ECPT table" depends on EFI_ECPT depends on EFI_LOADER_HII depends on EFI_RISCV_BOOT_PROTOCOL || !RISCV

@@ -393,7 +393,7 @@ config EFI_EBBR_2_0_CONFORMANCE depends on EFI_UNICODE_COLLATION_PROTOCOL2 default y 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 bool "RISCV_EFI_BOOT_PROTOCOL support" diff --git a/lib/efi_loader/efi_conformance.c b/lib/efi_loader/efi_conformance.c index a49aae92497..3036d46349a 100644 --- a/lib/efi_loader/efi_conformance.c +++ b/lib/efi_loader/efi_conformance.c @@ -12,8 +12,8 @@ #include <malloc.h>

static const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID; -static const efi_guid_t efi_ebbr_2_0_guid =

• EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID;

+static const efi_guid_t efi_ebbr_2_1_guid =

• EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID;

/**

• efi_ecpt_register() - Install the ECPT system table.

@@ -38,9 +38,9 @@ efi_status_t efi_ecpt_register(void) 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++],

• 	&efi_ebbr_2_0_guid);
  

• 	&efi_ebbr_2_1_guid);
  
  

  ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION; ecpt->number_of_profiles = num_entries;

diff --git a/lib/efi_selftest/efi_selftest_ecpt.c b/lib/efi_selftest/efi_selftest_ecpt.c index e8cc13545db..09c5e96c5e1 100644 --- a/lib/efi_selftest/efi_selftest_ecpt.c +++ b/lib/efi_selftest/efi_selftest_ecpt.c @@ -10,7 +10,7 @@ #include <efi_selftest.h>

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

@@ -53,9 +53,9 @@ static int execute(void) return EFI_ST_FAILURE; }

• if (CONFIG_IS_ENABLED(EFI_EBBR_2_0_CONFORMANCE)) {

• if (CONFIG_IS_ENABLED(EFI_EBBR_2_1_CONFORMANCE)) { ++expected_entries;

• if (ecpt_find_guid(ecpt, &guid_ebbr_2_0))
  

• if (ecpt_find_guid(ecpt, &guid_ebbr_2_1))
  return EFI_ST_FAILURE;
  

  }

Reviewed-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com