diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-22 11:16:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-22 11:16:22 -0400 |
| commit | b05a184379631d13c4a49e423aa1324dc1ae6158 (patch) | |
| tree | d9937c7de598c7edc5741ebc67c98dce47ea42d5 /lib/efi_loader/efi_setup.c | |
| parent | 5d2fae79c7d60eaf7f50322e4ec125d2f58544e9 (diff) | |
| parent | 5728246dfa11400d4f7aa8262ea630d8c09a85b9 (diff) | |
Merge tag 'x86-pull-20230922' of https://source.denx.de/u-boot/custodians/u-boot-x86 into next
- Add bootstd support to 64-bit efi payload
- Fix a bug of missing setting size of initrd in pxeboot
- Allow Python packages to be dropped
- Reland "x86: Move FACP table into separate functions"
- Fixes for chromebook_link64 and chromebook_samus_tpl
- Fixes and improvements for coreboot
- x86 documentation updates
Diffstat (limited to 'lib/efi_loader/efi_setup.c')
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 58d4e134023..e6de685e879 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -321,16 +321,16 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; #endif -#ifdef CONFIG_GENERATE_ACPI_TABLE - ret = efi_acpi_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_GENERATE_SMBIOS_TABLE - ret = efi_smbios_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif + if (IS_ENABLED(CONFIG_ACPI)) { + ret = efi_acpi_register(); + if (ret != EFI_SUCCESS) + goto out; + } + if (IS_ENABLED(CONFIG_SMBIOS)) { + ret = efi_smbios_register(); + if (ret != EFI_SUCCESS) + goto out; + } ret = efi_watchdog_register(); if (ret != EFI_SUCCESS) goto out; |