mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 07:30:26 +09:00
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>
This commit is contained in:
parent
75cb1cd248
commit
9b5e6396bf
@ -835,7 +835,7 @@ int dram_init_banksize(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
void efi_add_known_memory(void)
|
void efi_add_known_memory(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -135,7 +135,7 @@ remove_psci_node:
|
|||||||
|
|
||||||
fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code,
|
fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code,
|
||||||
*boot_code_size);
|
*boot_code_size);
|
||||||
#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
efi_add_memory_map((uintptr_t)&secondary_boot_code,
|
efi_add_memory_map((uintptr_t)&secondary_boot_code,
|
||||||
ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT,
|
ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT,
|
||||||
EFI_RESERVED_MEMORY_TYPE, false);
|
EFI_RESERVED_MEMORY_TYPE, false);
|
||||||
|
@ -36,7 +36,7 @@ __weak unsigned int install_e820_map(unsigned int max_entries,
|
|||||||
return 4;
|
return 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
void efi_add_known_memory(void)
|
void efi_add_known_memory(void)
|
||||||
{
|
{
|
||||||
struct e820_entry e820[E820MAX];
|
struct e820_entry e820[E820MAX];
|
||||||
@ -72,4 +72,4 @@ void efi_add_known_memory(void)
|
|||||||
efi_add_memory_map(start, pages, type, false);
|
efi_add_memory_map(start, pages, type, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* defined(EFI_LOADER) && !defined(CONFIG_SPL_BUILD) */
|
#endif /* CONFIG_IS_ENABLED(EFI_LOADER) */
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include <efi_api.h>
|
#include <efi_api.h>
|
||||||
|
|
||||||
/* No need for efi loader support in SPL */
|
/* 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>
|
#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,
|
void *efi_bootmgr_load(struct efi_device_path **device_path,
|
||||||
struct efi_device_path **file_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 */
|
/* Without CONFIG_EFI_LOADER we don't have a runtime section, stub it out */
|
||||||
#define __efi_runtime_data
|
#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_net_set_dhcp_ack(void *pkt, int len) { }
|
||||||
static inline void efi_print_image_infos(void *pc) { }
|
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 */
|
#endif /* _EFI_LOADER_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user