[PATCH] efi_loader: remove CONFIG_EFI_SECURE_BOOT in efi_loader.h
AKASHI Takahiro
takahiro.akashi at linaro.org
Tue Apr 21 02:38:38 CEST 2020
The guard doesn't make any difference, so remove it.
Signed-off-by: AKASHI Takahiro <takahiro.akashi at linaro.org>
Suggested-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
include/efi_loader.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 0ba9a1f702a6..8381aa5d5731 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -11,6 +11,7 @@
#include <common.h>
#include <part_efi.h>
#include <efi_api.h>
+#include <image.h>
#include <pe.h>
static inline int guidcmp(const void *g1, const void *g2)
@@ -695,9 +696,6 @@ void efi_deserialize_load_option(struct efi_load_option *lo, u8 *data);
unsigned long efi_serialize_load_option(struct efi_load_option *lo, u8 **data);
efi_status_t efi_bootmgr_load(efi_handle_t *handle);
-#ifdef CONFIG_EFI_SECURE_BOOT
-#include <image.h>
-
/**
* efi_image_regions - A list of memory regions
*
@@ -767,7 +765,6 @@ bool efi_secure_boot_enabled(void);
bool efi_image_parse(void *efi, size_t len, struct efi_image_regions **regp,
WIN_CERTIFICATE **auth, size_t *auth_len);
-#endif /* CONFIG_EFI_SECURE_BOOT */
#else /* CONFIG_IS_ENABLED(EFI_LOADER) */
--
2.25.2
More information about the U-Boot
mailing list