From 6d19a20f5fb46956d4324dff28ed4b59dc7776a3 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Thu, 22 Nov 2018 11:15:29 +0100 Subject: mb: Set coreboot as DSDT's manufacturer model ID Field 'OEMID' & "OEM Table ID" are related to DSDT table not to mainboard. So use macro to set them respectvely to "COREv4" and "COREBOOT". Change-Id: I060e07a730e721df4a86128ee89bfe168c69f31e Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/29790 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: David Guckian --- src/arch/x86/acpi/debug.asl | 5 +++-- src/arch/x86/include/arch/acpi.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/acpi/debug.asl b/src/arch/x86/acpi/debug.asl index 44c37bb9a0..04a6026d7e 100644 --- a/src/arch/x86/acpi/debug.asl +++ b/src/arch/x86/acpi/debug.asl @@ -14,12 +14,13 @@ */ /* + #include DefinitionBlock ( "DSDT.AML", "DSDT", 0x01, - "XXXXXX", - "XXXXXXXX", + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 ) { diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index b5205c018e..f6944e420a 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -52,6 +52,9 @@ #define SLP_TYP_S5 5 #endif +#define ACPI_TABLE_CREATOR "COREBOOT" /* Must be exactly 8 bytes long! */ +#define OEM_ID "COREv4" /* Must be exactly 6 bytes long! */ + #if !defined(__ASSEMBLER__) && !defined(__ACPI__) && !defined(__ROMCC__) #include #include @@ -61,8 +64,6 @@ #include #define RSDP_SIG "RSD PTR " /* RSDT pointer signature */ -#define ACPI_TABLE_CREATOR "COREBOOT" /* Must be exactly 8 bytes long! */ -#define OEM_ID "CORE " /* Must be exactly 6 bytes long! */ #define ASLC "CORE" /* Must be exactly 4 bytes long! */ /* -- cgit v1.2.3