diff options
| author | Tom Rini <[email protected]> | 2023-02-10 09:17:25 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-02-10 09:17:25 -0500 |
| commit | 8b301102e246350a0ccedc370f7c9923b02f86f2 (patch) | |
| tree | 15ddc9d376d630efb4c614c4bda559d3c0c99d64 /lib/efi_loader | |
| parent | 81e8a51cee2b265e26272f0c67518c4844baa36c (diff) | |
| parent | 42a13b21dcb6663847ae71c0a42dcf2f4149b69a (diff) | |
Merge branch '2023-02-08-Kconfig-cleanup-CONFIG_IS_ENABLED-to-IS_ENABLED'
- This series brings in a large number of patches in the form of changing
CONFIG_IS_ENABLED(FOO) to IS_ENABLED(CONFIG_FOO) when there it is the
case that CONFIG_xPL_FOO is never a valid symbol. The majority of
the times where we do this, it is unintentional and does not make the
code more useful, or rarely, introduces bugs.
Diffstat (limited to 'lib/efi_loader')
| -rw-r--r-- | lib/efi_loader/efi_image_loader.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_root_node.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index eaf75a5803d..26df0da16c9 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -938,7 +938,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, goto err; } -#if CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL) +#if IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL) /* Measure an PE/COFF image */ ret = tcg2_measure_pe_image(efi, efi_size, handle, loaded_image_info); if (ret == EFI_SECURITY_VIOLATION) { diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index a4eb6f493dc..108c14b95bd 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -58,7 +58,7 @@ efi_status_t efi_root_node_register(void) &efi_guid_device_path_to_text_protocol, &efi_device_path_to_text, #endif -#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_UTIL) +#if IS_ENABLED(CONFIG_EFI_DEVICE_PATH_UTIL) /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, &efi_device_path_utilities, @@ -68,11 +68,11 @@ efi_status_t efi_root_node_register(void) &efi_guid_dt_fixup_protocol, &efi_dt_fixup_prot, #endif -#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) +#if IS_ENABLED(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) &efi_guid_unicode_collation_protocol2, &efi_unicode_collation_protocol2, #endif -#if CONFIG_IS_ENABLED(EFI_LOADER_HII) +#if IS_ENABLED(CONFIG_EFI_LOADER_HII) /* HII string protocol */ &efi_guid_hii_string_protocol, &efi_hii_string, |