Hi Vincent Thanks fo fixing this and apologies for the delayed response.
[...] > --- > include/efi_api.h | 12 ++++++++++ > lib/efi_loader/Kconfig | 52 > ++++++++++++++++++++++++++++++++++++++++ > lib/efi_loader/efi_conformance.c | 9 +++++++ > 3 files changed, 73 insertions(+) > > diff --git a/include/efi_api.h b/include/efi_api.h [...] > > +config HAVE_EFI_EBBR_2_2 > + bool > + depends on HAVE_EFI_EBBR_2_1 > + depends on EFI_TCG2_PROTOCOL || !TPM_V2 > + depends on EFI_CAPSULE_ON_DISK || !EFI_HAVE_CAPSULE_SUPPORT > + default y > + > +config HAVE_EFI_EBBR_2_3 > + bool > + depends on HAVE_EFI_EBBR_2_2 > + depends on EFI_CAPSULE_AUTHENTICATE || !EFI_HAVE_CAPSULE_SUPPORT > + depends on EFI_CAPSULE_FIRMWARE_MANAGEMENT || > !EFI_HAVE_CAPSULE_SUPPORT > + depends on EFI_BOOTMGR > + depends on BOOTMETH_EFI_BOOTMGR I don't think we need this. The EFI_BOOTMGR should be enough, this is the additional bootflow and bootmethods. Other than that it looks correct to me. Heinrich, do you want me to fix this up on merge and send a PR ? Cheers /Ilias > + default y > + > +config HAVE_EFI_EBBR_2_4 > + bool > + depends on HAVE_EFI_EBBR_2_3 > + default y > + > config EFI_ECPT > bool "Enable the UEFI ECPT generation" > default y > @@ -593,6 +614,37 @@ config EFI_EBBR_2_1_CONFORMANCE > Enabling this option adds the Embedded Base Boot Requirements (EBBR) > v2.1 conformance entry to the ECPT. > > +config EFI_EBBR_2_2_CONFORMANCE > + bool "Add the EBBR v2.2 conformance entry to the ECPT" > + depends on EFI_ECPT && HAVE_EFI_EBBR_2_2 > + default y > + help > + Enabling this option adds the Embedded Base Boot Requirements (EBBR) > + v2.2 conformance entry to the ECPT. > + > + Version 2.2 adds requirements around TCG2 and capsule "on disk". > + > +config EFI_EBBR_2_3_CONFORMANCE > + bool "Add the EBBR v2.3 conformance entry to the ECPT" > + depends on EFI_ECPT && HAVE_EFI_EBBR_2_3 > + default y > + help > + Enabling this option adds the Embedded Base Boot Requirements (EBBR) > + v2.3 conformance entry to the ECPT. > + > + Version 2.3 adds requirements around authenticated capsules in FMP > + format and the boot manager. > + > +config EFI_EBBR_2_4_CONFORMANCE > + bool "Add the EBBR v2.4 conformance entry to the ECPT" > + depends on EFI_ECPT && HAVE_EFI_EBBR_2_4 > + default y > + help > + Enabling this option adds the Embedded Base Boot Requirements (EBBR) > + v2.4 conformance entry to the ECPT. > + > + Version 2.4 adds non-UEFI requirements. > + > config EFI_CONSOLE_DISABLE_ANSI > bool "Disable ANSI escape sequence queries for console size" > help > diff --git a/lib/efi_loader/efi_conformance.c > b/lib/efi_loader/efi_conformance.c > index 470141af483..c1234681bb6 100644 > --- a/lib/efi_loader/efi_conformance.c > +++ b/lib/efi_loader/efi_conformance.c > @@ -29,6 +29,15 @@ efi_status_t efi_ecpt_register(void) > #if CONFIG_IS_ENABLED(EFI_EBBR_2_1_CONFORMANCE) > EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID, > #endif > + #if CONFIG_IS_ENABLED(EFI_EBBR_2_2_CONFORMANCE) > + EFI_CONFORMANCE_PROFILE_EBBR_2_2_GUID, > + #endif > + #if CONFIG_IS_ENABLED(EFI_EBBR_2_3_CONFORMANCE) > + EFI_CONFORMANCE_PROFILE_EBBR_2_3_GUID, > + #endif > + #if CONFIG_IS_ENABLED(EFI_EBBR_2_4_CONFORMANCE) > + EFI_CONFORMANCE_PROFILE_EBBR_2_4_GUID, > + #endif > }; > > ecpt_size = sizeof(profiles) > > -- > 2.53.0 >
