diff options
| author | Stephen Warren <swarren@nvidia.com> | 2018-08-30 15:43:43 -0600 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-09-23 21:55:29 +0200 |
| commit | 9b5e6396bff5ede22f880c38915da5538e8bd117 (patch) | |
| tree | d6e83929dc6c3d71548131c6ee65bc7fcff19c52 /include | |
| parent | 75cb1cd248690e2c1b1d46081e2a25e6d2aa57f6 (diff) | |
| download | u-boot-9b5e6396bff5ede22f880c38915da5538e8bd117.tar.gz | |
efi_loader: simplify ifdefs
Use CONFIG_IS_ENABLED(EFI_LOADER) to avoid explicitly checking CONFIG_SPL
too. This simplifies the conditional.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_loader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index f162adfff7..b46babf931 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -13,7 +13,7 @@ #include <efi_api.h> /* No need for efi loader support in SPL */ -#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD) +#if CONFIG_IS_ENABLED(EFI_LOADER) #include <linux/list.h> @@ -460,7 +460,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor, void *efi_bootmgr_load(struct efi_device_path **device_path, struct efi_device_path **file_path); -#else /* defined(EFI_LOADER) && !defined(CONFIG_SPL_BUILD) */ +#else /* CONFIG_IS_ENABLED(EFI_LOADER) */ /* Without CONFIG_EFI_LOADER we don't have a runtime section, stub it out */ #define __efi_runtime_data @@ -477,6 +477,6 @@ static inline void efi_set_bootdev(const char *dev, const char *devnr, static inline void efi_net_set_dhcp_ack(void *pkt, int len) { } static inline void efi_print_image_infos(void *pc) { } -#endif /* CONFIG_EFI_LOADER && !CONFIG_SPL_BUILD */ +#endif /* CONFIG_IS_ENABLED(EFI_LOADER) */ #endif /* _EFI_LOADER_H */ |