diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-19 07:48:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-19 07:48:16 -0400 |
| commit | 3431b392ad50ff37fa3d6e7715c6a99c74d692dc (patch) | |
| tree | 53b6785acaa658a60c6a854af4dea9040f826b48 /arch/x86/lib/tables.c | |
| parent | 68ff827ec74fdca8f17d469f22e1032ed14cb795 (diff) | |
| parent | 3fb97e267a5e136d8386a7cb1d5b4fe63af518eb (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2016-10-19
Highlights this time around:
- Add run time service (power control) support for PSCI (fixed in v3)
- Add efi gop pointer exposure
- SMBIOS support for EFI (on ARM)
- efi pool memory unmap support (needed for 4.8)
- initial x86 efi payload support (fixed up in v2)
- various bug fixes
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/tables_csum.h
Diffstat (limited to 'arch/x86/lib/tables.c')
| -rw-r--r-- | arch/x86/lib/tables.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 9ee6b5e9249..025b183d6bd 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -5,13 +5,18 @@ */ #include <common.h> +#include <smbios.h> #include <asm/sfi.h> #include <asm/mpspec.h> -#include <asm/smbios.h> #include <asm/tables.h> #include <asm/acpi_table.h> #include <asm/coreboot_tables.h> +static u32 write_smbios_table_wrapper(u32 addr) +{ + return write_smbios_table(addr); +} + /** * Function prototype to write a specific configuration table * @@ -34,7 +39,7 @@ static table_write table_write_funcs[] = { write_acpi_tables, #endif #ifdef CONFIG_GENERATE_SMBIOS_TABLE - write_smbios_table, + write_smbios_table_wrapper, #endif }; |