diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-17 09:12:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-17 09:12:27 -0500 |
| commit | 106332d6cc583c4339e07020989d09b567900a59 (patch) | |
| tree | 746beb976633e80b5c824805100490bb51cb9ffb /arch/x86/lib/tables.c | |
| parent | 043ca8c8a9b181cf6f17441e9b89b5ee33206309 (diff) | |
| parent | a300ac3851440906a3934915bd12db2b96987a6a (diff) | |
Merge branch '2024-01-16-assorted-updates-and-improvements'
- Add more pytests to exercise functionality on real hardware, cleanup
and add tests around "cp"/memmove, add phyCORE-AM62x and Phytium
Pe2201 platforms, Nuvoton NPCM BMC reset driver and improve QEMU
SMBIOS support
Diffstat (limited to 'arch/x86/lib/tables.c')
| -rw-r--r-- | arch/x86/lib/tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index d43e77d3730..12eae17c396 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -62,7 +62,7 @@ static struct table_info table_list[] = { #ifdef CONFIG_GENERATE_ACPI_TABLE { "acpi", write_acpi_tables, BLOBLISTT_ACPI_TABLES, 0x10000, 0x1000}, #endif -#ifdef CONFIG_GENERATE_SMBIOS_TABLE +#if defined(CONFIG_GENERATE_SMBIOS_TABLE) && !defined(CONFIG_QFW_SMBIOS) { "smbios", write_smbios_table, BLOBLISTT_SMBIOS_TABLES, 0x1000, 0x100}, #endif }; |