diff options
| author | Elyes HAOUAS <ehaouas@noos.fr> | 2018-11-22 11:15:29 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-11-23 11:00:40 +0000 |
| commit | 6d19a20f5fb46956d4324dff28ed4b59dc7776a3 (patch) | |
| tree | e300bcefa622ddf224771971e870f64f7987886d | |
| parent | e7207593ec1854431375f8c4f5c0f03dd12723fc (diff) | |
| download | coreboot-6d19a20f5fb46956d4324dff28ed4b59dc7776a3.tar.xz | |
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 <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/29790
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: David Guckian
275 files changed, 722 insertions, 445 deletions
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 <arch/acpi.h> 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 <stdint.h> #include <rules.h> @@ -61,8 +64,6 @@ #include <cper.h> #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! */ /* diff --git a/src/mainboard/adi/rcc-dff/dsdt.asl b/src/mainboard/adi/rcc-dff/dsdt.asl index eb661c26e7..8091a4e6c2 100644 --- a/src/mainboard/adi/rcc-dff/dsdt.asl +++ b/src/mainboard/adi/rcc-dff/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/advansus/a785e-i/acpi/cpstate.asl b/src/mainboard/advansus/a785e-i/acpi/cpstate.asl index afba4ffa93..5d71c8164f 100644 --- a/src/mainboard/advansus/a785e-i/acpi/cpstate.asl +++ b/src/mainboard/advansus/a785e-i/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/advansus/a785e-i/acpi/routing.asl b/src/mainboard/advansus/a785e-i/acpi/routing.asl index 2d57bc55fa..46920552e7 100644 --- a/src/mainboard/advansus/a785e-i/acpi/routing.asl +++ b/src/mainboard/advansus/a785e-i/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/advansus/a785e-i/acpi/usb.asl b/src/mainboard/advansus/a785e-i/acpi/usb.asl index 0f8ca9c0ab..cd76bf1f94 100644 --- a/src/mainboard/advansus/a785e-i/acpi/usb.asl +++ b/src/mainboard/advansus/a785e-i/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/advansus/a785e-i/dsdt.asl b/src/mainboard/advansus/a785e-i/dsdt.asl index 6685ca7247..4eececb1ab 100644 --- a/src/mainboard/advansus/a785e-i/dsdt.asl +++ b/src/mainboard/advansus/a785e-i/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ADVANS", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/bettong/acpi/routing.asl b/src/mainboard/amd/bettong/acpi/routing.asl index bcf0e9035c..0c4edbbee9 100644 --- a/src/mainboard/amd/bettong/acpi/routing.asl +++ b/src/mainboard/amd/bettong/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/bettong/acpi/usb_oc.asl b/src/mainboard/amd/bettong/acpi/usb_oc.asl index 9dae253ac0..328883af91 100644 --- a/src/mainboard/amd/bettong/acpi/usb_oc.asl +++ b/src/mainboard/amd/bettong/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/bettong/dsdt.asl b/src/mainboard/amd/bettong/dsdt.asl index 505b519776..f6449ece99 100644 --- a/src/mainboard/amd/bettong/dsdt.asl +++ b/src/mainboard/amd/bettong/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl b/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl +++ b/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/amd/bimini_fam10/acpi/routing.asl b/src/mainboard/amd/bimini_fam10/acpi/routing.asl index aa50111d59..0c18e25eea 100644 --- a/src/mainboard/amd/bimini_fam10/acpi/routing.asl +++ b/src/mainboard/amd/bimini_fam10/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/bimini_fam10/acpi/usb.asl b/src/mainboard/amd/bimini_fam10/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/amd/bimini_fam10/acpi/usb.asl +++ b/src/mainboard/amd/bimini_fam10/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/bimini_fam10/dsdt.asl b/src/mainboard/amd/bimini_fam10/dsdt.asl index 96dc819045..ed181a36dc 100644 --- a/src/mainboard/amd/bimini_fam10/dsdt.asl +++ b/src/mainboard/amd/bimini_fam10/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/db-ft3b-lc/acpi/routing.asl b/src/mainboard/amd/db-ft3b-lc/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/amd/db-ft3b-lc/acpi/routing.asl +++ b/src/mainboard/amd/db-ft3b-lc/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/db-ft3b-lc/acpi/usb_oc.asl b/src/mainboard/amd/db-ft3b-lc/acpi/usb_oc.asl index 1643fe7cb4..4ebb4b64a6 100644 --- a/src/mainboard/amd/db-ft3b-lc/acpi/usb_oc.asl +++ b/src/mainboard/amd/db-ft3b-lc/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/db-ft3b-lc/dsdt.asl b/src/mainboard/amd/db-ft3b-lc/dsdt.asl index 549adc00ec..f1ff974b49 100644 --- a/src/mainboard/amd/db-ft3b-lc/dsdt.asl +++ b/src/mainboard/amd/db-ft3b-lc/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/gardenia/acpi/routing.asl b/src/mainboard/amd/gardenia/acpi/routing.asl index 51cb612086..f81b94c2e2 100644 --- a/src/mainboard/amd/gardenia/acpi/routing.asl +++ b/src/mainboard/amd/gardenia/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/gardenia/acpi/usb_oc.asl b/src/mainboard/amd/gardenia/acpi/usb_oc.asl index 9566bc41fb..ed32c70149 100644 --- a/src/mainboard/amd/gardenia/acpi/usb_oc.asl +++ b/src/mainboard/amd/gardenia/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/gardenia/dsdt.asl b/src/mainboard/amd/gardenia/dsdt.asl index 990f456e2c..f190b4e505 100644 --- a/src/mainboard/amd/gardenia/dsdt.asl +++ b/src/mainboard/amd/gardenia/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/inagua/acpi/routing.asl b/src/mainboard/amd/inagua/acpi/routing.asl index 8bd3e4de3d..537bcacaa1 100644 --- a/src/mainboard/amd/inagua/acpi/routing.asl +++ b/src/mainboard/amd/inagua/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/inagua/acpi/usb_oc.asl b/src/mainboard/amd/inagua/acpi/usb_oc.asl index 6e9c701a26..a209909b32 100644 --- a/src/mainboard/amd/inagua/acpi/usb_oc.asl +++ b/src/mainboard/amd/inagua/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/inagua/dsdt.asl b/src/mainboard/amd/inagua/dsdt.asl index 7a6d2e192c..5496288651 100644 --- a/src/mainboard/amd/inagua/dsdt.asl +++ b/src/mainboard/amd/inagua/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/lamar/dsdt.asl b/src/mainboard/amd/lamar/dsdt.asl index 1f3f2916e4..1db743d5ca 100644 --- a/src/mainboard/amd/lamar/dsdt.asl +++ b/src/mainboard/amd/lamar/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl b/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl +++ b/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/amd/mahogany_fam10/acpi/routing.asl b/src/mainboard/amd/mahogany_fam10/acpi/routing.asl index 88d1e4cdda..4c3075c368 100644 --- a/src/mainboard/amd/mahogany_fam10/acpi/routing.asl +++ b/src/mainboard/amd/mahogany_fam10/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/mahogany_fam10/acpi/usb.asl b/src/mainboard/amd/mahogany_fam10/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/amd/mahogany_fam10/acpi/usb.asl +++ b/src/mainboard/amd/mahogany_fam10/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl index 57afc29547..9528e01080 100644 --- a/src/mainboard/amd/mahogany_fam10/dsdt.asl +++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/olivehill/acpi/routing.asl b/src/mainboard/amd/olivehill/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/amd/olivehill/acpi/routing.asl +++ b/src/mainboard/amd/olivehill/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/olivehill/acpi/usb_oc.asl b/src/mainboard/amd/olivehill/acpi/usb_oc.asl index acdc8f8018..513d66d1d7 100644 --- a/src/mainboard/amd/olivehill/acpi/usb_oc.asl +++ b/src/mainboard/amd/olivehill/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/olivehill/dsdt.asl b/src/mainboard/amd/olivehill/dsdt.asl index e2d02087cc..c4fc93484e 100644 --- a/src/mainboard/amd/olivehill/dsdt.asl +++ b/src/mainboard/amd/olivehill/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/olivehillplus/acpi/routing.asl b/src/mainboard/amd/olivehillplus/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/amd/olivehillplus/acpi/routing.asl +++ b/src/mainboard/amd/olivehillplus/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl b/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl index 1643fe7cb4..4ebb4b64a6 100644 --- a/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl +++ b/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/olivehillplus/dsdt.asl b/src/mainboard/amd/olivehillplus/dsdt.asl index 549adc00ec..f1ff974b49 100644 --- a/src/mainboard/amd/olivehillplus/dsdt.asl +++ b/src/mainboard/amd/olivehillplus/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/parmer/dsdt.asl b/src/mainboard/amd/parmer/dsdt.asl index 01f9da1f3c..77bd704590 100644 --- a/src/mainboard/amd/parmer/dsdt.asl +++ b/src/mainboard/amd/parmer/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/persimmon/acpi/routing.asl b/src/mainboard/amd/persimmon/acpi/routing.asl index 6f94b45004..2cf17a7f69 100644 --- a/src/mainboard/amd/persimmon/acpi/routing.asl +++ b/src/mainboard/amd/persimmon/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/persimmon/acpi/usb_oc.asl b/src/mainboard/amd/persimmon/acpi/usb_oc.asl index 6e9c701a26..a209909b32 100644 --- a/src/mainboard/amd/persimmon/acpi/usb_oc.asl +++ b/src/mainboard/amd/persimmon/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/persimmon/dsdt.asl b/src/mainboard/amd/persimmon/dsdt.asl index 7a6d2e192c..5496288651 100644 --- a/src/mainboard/amd/persimmon/dsdt.asl +++ b/src/mainboard/amd/persimmon/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl index f8709a4323..e04bf1d25b 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl @@ -12,7 +12,8 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMDF10", "AMDACPI ", 100925440) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.aml", "DSDT", 1, OEM_ID, ACPI_TABLE_CREATOR, 100925440) { // Scope (_PR) diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl index 022f52253f..264e962371 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl @@ -12,7 +12,8 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMDF10", "AMDACPI ", 100925440) +#include <arch/acpi.h> +DefinitionBlock ("SSDT2.aml", "SSDT", 1, OEM_ID, ACPI_TABLE_CREATOR, 100925440) { Scope (_SB) { diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl index 4ece0a8e9f..776ea95722 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl @@ -12,7 +12,8 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMDF10", "AMDACPI ", 100925440) +#include <arch/acpi.h> +DefinitionBlock ("SSDT3.aml", "SSDT", 1, OEM_ID, ACPI_TABLE_CREATOR, 100925440) { Scope (_SB) { diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl index d5d85e4f43..78fc3b2922 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl @@ -12,7 +12,8 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMDF10", "AMDACPI ", 100925440) +#include <arch/acpi.h> +DefinitionBlock ("SSDT4.aml", "SSDT", 1, OEM_ID, ACPI_TABLE_CREATOR, 100925440) { Scope (_SB) { diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl index 9d960aba86..b44346fd44 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl @@ -13,7 +13,8 @@ // GNU General Public License for more details. // -DefinitionBlock ("SSDT5.aml", "SSDT", 1, "AMDF10", "AMDACPI ", 100925440) +#include <arch/acpi.h> +DefinitionBlock ("SSDT5.aml", "SSDT", 1, OEM_ID, ACPI_TABLE_CREATOR, 100925440) { Scope (_SB) { diff --git a/src/mainboard/amd/south_station/acpi/routing.asl b/src/mainboard/amd/south_station/acpi/routing.asl index 8bd3e4de3d..537bcacaa1 100644 --- a/src/mainboard/amd/south_station/acpi/routing.asl +++ b/src/mainboard/amd/south_station/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/south_station/acpi/usb_oc.asl b/src/mainboard/amd/south_station/acpi/usb_oc.asl index 299d4aa55c..13111b778e 100644 --- a/src/mainboard/amd/south_station/acpi/usb_oc.asl +++ b/src/mainboard/amd/south_station/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/south_station/dsdt.asl b/src/mainboard/amd/south_station/dsdt.asl index 7a6d2e192c..5496288651 100644 --- a/src/mainboard/amd/south_station/dsdt.asl +++ b/src/mainboard/amd/south_station/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/thatcher/acpi/cpstate.asl b/src/mainboard/amd/thatcher/acpi/cpstate.asl index 0951006d36..69de2d86a3 100644 --- a/src/mainboard/amd/thatcher/acpi/cpstate.asl +++ b/src/mainboard/amd/thatcher/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/amd/thatcher/dsdt.asl b/src/mainboard/amd/thatcher/dsdt.asl index 01f9da1f3c..77bd704590 100644 --- a/src/mainboard/amd/thatcher/dsdt.asl +++ b/src/mainboard/amd/thatcher/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl b/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl +++ b/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/amd/tilapia_fam10/acpi/routing.asl b/src/mainboard/amd/tilapia_fam10/acpi/routing.asl index 02a0a23dbb..072aa2117f 100644 --- a/src/mainboard/amd/tilapia_fam10/acpi/routing.asl +++ b/src/mainboard/amd/tilapia_fam10/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/tilapia_fam10/acpi/usb.asl b/src/mainboard/amd/tilapia_fam10/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/amd/tilapia_fam10/acpi/usb.asl +++ b/src/mainboard/amd/tilapia_fam10/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl index 2151222033..f174976491 100644 --- a/src/mainboard/amd/tilapia_fam10/dsdt.asl +++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/torpedo/acpi/routing.asl b/src/mainboard/amd/torpedo/acpi/routing.asl index 6ec0fc5ed0..5df2eeb3af 100644 --- a/src/mainboard/amd/torpedo/acpi/routing.asl +++ b/src/mainboard/amd/torpedo/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/torpedo/dsdt.asl b/src/mainboard/amd/torpedo/dsdt.asl index 4ee5fb4ad7..9626ec66fa 100644 --- a/src/mainboard/amd/torpedo/dsdt.asl +++ b/src/mainboard/amd/torpedo/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/amd/union_station/acpi/routing.asl b/src/mainboard/amd/union_station/acpi/routing.asl index 8bd3e4de3d..537bcacaa1 100644 --- a/src/mainboard/amd/union_station/acpi/routing.asl +++ b/src/mainboard/amd/union_station/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/amd/union_station/acpi/usb_oc.asl b/src/mainboard/amd/union_station/acpi/usb_oc.asl index 299d4aa55c..13111b778e 100644 --- a/src/mainboard/amd/union_station/acpi/usb_oc.asl +++ b/src/mainboard/amd/union_station/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl index 7a6d2e192c..5496288651 100644 --- a/src/mainboard/amd/union_station/dsdt.asl +++ b/src/mainboard/amd/union_station/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/aopen/dxplplusu/dsdt.asl b/src/mainboard/aopen/dxplplusu/dsdt.asl index 908a9f543e..011428a09f 100644 --- a/src/mainboard/aopen/dxplplusu/dsdt.asl +++ b/src/mainboard/aopen/dxplplusu/dsdt.asl @@ -15,12 +15,13 @@ #include <arch/ioapic.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20111103 // OEM revision ) { diff --git a/src/mainboard/apple/macbook21/dsdt.asl b/src/mainboard/apple/macbook21/dsdt.asl index 76b95ac542..830c0c8741 100644 --- a/src/mainboard/apple/macbook21/dsdt.asl +++ b/src/mainboard/apple/macbook21/dsdt.asl @@ -18,12 +18,13 @@ #define BRIGHTNESS_DOWN \DSPC.BRTD #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/apple/macbookair4_2/dsdt.asl b/src/mainboard/apple/macbookair4_2/dsdt.asl index ac2d1bde1d..10baddb074 100644 --- a/src/mainboard/apple/macbookair4_2/dsdt.asl +++ b/src/mainboard/apple/macbookair4_2/dsdt.asl @@ -14,12 +14,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/asrock/b75pro3-m/dsdt.asl b/src/mainboard/asrock/b75pro3-m/dsdt.asl index 44141c32aa..5c86e77673 100644 --- a/src/mainboard/asrock/b75pro3-m/dsdt.asl +++ b/src/mainboard/asrock/b75pro3-m/dsdt.asl @@ -17,12 +17,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/asrock/e350m1/acpi/routing.asl b/src/mainboard/asrock/e350m1/acpi/routing.asl index 8bd3e4de3d..537bcacaa1 100644 --- a/src/mainboard/asrock/e350m1/acpi/routing.asl +++ b/src/mainboard/asrock/e350m1/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/asrock/e350m1/acpi/usb_oc.asl b/src/mainboard/asrock/e350m1/acpi/usb_oc.asl index 6e9c701a26..a209909b32 100644 --- a/src/mainboard/asrock/e350m1/acpi/usb_oc.asl +++ b/src/mainboard/asrock/e350m1/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/asrock/e350m1/dsdt.asl b/src/mainboard/asrock/e350m1/dsdt.asl index c70ba80b8a..a958ce5f80 100644 --- a/src/mainboard/asrock/e350m1/dsdt.asl +++ b/src/mainboard/asrock/e350m1/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASROCK", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asrock/g41c-gs/dsdt.asl b/src/mainboard/asrock/g41c-gs/dsdt.asl index 8c99025d30..4eade3dfbb 100644 --- a/src/mainboard/asrock/g41c-gs/dsdt.asl +++ b/src/mainboard/asrock/g41c-gs/dsdt.asl @@ -16,12 +16,13 @@ #include <southbridge/intel/i82801gx/i82801gx.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/asrock/h81m-hds/dsdt.asl b/src/mainboard/asrock/h81m-hds/dsdt.asl index c02e48659e..917b2e4ce5 100644 --- a/src/mainboard/asrock/h81m-hds/dsdt.asl +++ b/src/mainboard/asrock/h81m-hds/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT Revision: ACPI v3.0 */ - "COREv4", /* OEM ID */ - "COREBOOT", /* OEM Table ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20181031 /* OEM Revision */ ) { diff --git a/src/mainboard/asrock/imb-a180/acpi/routing.asl b/src/mainboard/asrock/imb-a180/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/asrock/imb-a180/acpi/routing.asl +++ b/src/mainboard/asrock/imb-a180/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl b/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl index f4055efdf4..9e0d032c71 100644 --- a/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl +++ b/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/asrock/imb-a180/dsdt.asl b/src/mainboard/asrock/imb-a180/dsdt.asl index e2d02087cc..c4fc93484e 100644 --- a/src/mainboard/asrock/imb-a180/dsdt.asl +++ b/src/mainboard/asrock/imb-a180/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/am1i-a/dsdt.asl b/src/mainboard/asus/am1i-a/dsdt.asl index 94f83ecf08..88222bda63 100644 --- a/src/mainboard/asus/am1i-a/dsdt.asl +++ b/src/mainboard/asus/am1i-a/dsdt.asl @@ -17,12 +17,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl index 0951006d36..69de2d86a3 100644 --- a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl +++ b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/asus/f2a85-m/dsdt.asl b/src/mainboard/asus/f2a85-m/dsdt.asl index 76f1272b31..45a2606611 100644 --- a/src/mainboard/asus/f2a85-m/dsdt.asl +++ b/src/mainboard/asus/f2a85-m/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/kcma-d8/dsdt.asl b/src/mainboard/asus/kcma-d8/dsdt.asl index 589ed32f3f..fedcad0869 100644 --- a/src/mainboard/asus/kcma-d8/dsdt.asl +++ b/src/mainboard/asus/kcma-d8/dsdt.asl @@ -30,12 +30,13 @@ * PCI link routing templates taken from ck804.asl and modified for this board */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 or higher for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00000001 /* OEM Revision */ ) { diff --git a/src/mainboard/asus/kfsn4-dre/dsdt.asl b/src/mainboard/asus/kfsn4-dre/dsdt.asl index f3d59ce470..4296a81475 100644 --- a/src/mainboard/asus/kfsn4-dre/dsdt.asl +++ b/src/mainboard/asus/kfsn4-dre/dsdt.asl @@ -30,12 +30,13 @@ * PCI link routing templates taken from ck804.asl and modified for this board */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00000001 /* OEM Revision */ ) { diff --git a/src/mainboard/asus/kgpe-d16/dsdt.asl b/src/mainboard/asus/kgpe-d16/dsdt.asl index 31398eb2a0..efb67a558c 100644 --- a/src/mainboard/asus/kgpe-d16/dsdt.asl +++ b/src/mainboard/asus/kgpe-d16/dsdt.asl @@ -30,12 +30,13 @@ * PCI link routing templates taken from ck804.asl and modified for this board */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 or higher for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00000001 /* OEM Revision */ ) { diff --git a/src/mainboard/asus/m4a78-em/acpi/cpstate.asl b/src/mainboard/asus/m4a78-em/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/asus/m4a78-em/acpi/cpstate.asl +++ b/src/mainboard/asus/m4a78-em/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/asus/m4a78-em/acpi/routing.asl b/src/mainboard/asus/m4a78-em/acpi/routing.asl index 02a0a23dbb..072aa2117f 100644 --- a/src/mainboard/asus/m4a78-em/acpi/routing.asl +++ b/src/mainboard/asus/m4a78-em/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/asus/m4a78-em/acpi/usb.asl b/src/mainboard/asus/m4a78-em/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/asus/m4a78-em/acpi/usb.asl +++ b/src/mainboard/asus/m4a78-em/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/asus/m4a78-em/dsdt.asl b/src/mainboard/asus/m4a78-em/dsdt.asl index e9664d2b99..3059be9a37 100644 --- a/src/mainboard/asus/m4a78-em/dsdt.asl +++ b/src/mainboard/asus/m4a78-em/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/m4a785-m/acpi/cpstate.asl b/src/mainboard/asus/m4a785-m/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/asus/m4a785-m/acpi/cpstate.asl +++ b/src/mainboard/asus/m4a785-m/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/asus/m4a785-m/acpi/routing.asl b/src/mainboard/asus/m4a785-m/acpi/routing.asl index 02a0a23dbb..072aa2117f 100644 --- a/src/mainboard/asus/m4a785-m/acpi/routing.asl +++ b/src/mainboard/asus/m4a785-m/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/asus/m4a785-m/acpi/usb.asl b/src/mainboard/asus/m4a785-m/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/asus/m4a785-m/acpi/usb.asl +++ b/src/mainboard/asus/m4a785-m/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/asus/m4a785-m/dsdt.asl b/src/mainboard/asus/m4a785-m/dsdt.asl index e9664d2b99..3059be9a37 100644 --- a/src/mainboard/asus/m4a785-m/dsdt.asl +++ b/src/mainboard/asus/m4a785-m/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl b/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl index d90851f03e..f8cfda2424 100644 --- a/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl +++ b/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/asus/m4a785t-m/acpi/routing.asl b/src/mainboard/asus/m4a785t-m/acpi/routing.asl index 02a0a23dbb..072aa2117f 100644 --- a/src/mainboard/asus/m4a785t-m/acpi/routing.asl +++ b/src/mainboard/asus/m4a785t-m/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/asus/m4a785t-m/acpi/usb.asl b/src/mainboard/asus/m4a785t-m/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/asus/m4a785t-m/acpi/usb.asl +++ b/src/mainboard/asus/m4a785t-m/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/asus/m4a785t-m/dsdt.asl b/src/mainboard/asus/m4a785t-m/dsdt.asl index 32b781788a..debbb8cffd 100644 --- a/src/mainboard/asus/m4a785t-m/dsdt.asl +++ b/src/mainboard/asus/m4a785t-m/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/m5a88-v/acpi/cpstate.asl b/src/mainboard/asus/m5a88-v/acpi/cpstate.asl index afba4ffa93..5d71c8164f 100644 --- a/src/mainboard/asus/m5a88-v/acpi/cpstate.asl +++ b/src/mainboard/asus/m5a88-v/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/asus/m5a88-v/acpi/routing.asl b/src/mainboard/asus/m5a88-v/acpi/routing.asl index 2d57bc55fa..46920552e7 100644 --- a/src/mainboard/asus/m5a88-v/acpi/routing.asl +++ b/src/mainboard/asus/m5a88-v/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/asus/m5a88-v/acpi/usb.asl b/src/mainboard/asus/m5a88-v/acpi/usb.asl index 0f8ca9c0ab..cd76bf1f94 100644 --- a/src/mainboard/asus/m5a88-v/acpi/usb.asl +++ b/src/mainboard/asus/m5a88-v/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/asus/m5a88-v/dsdt.asl b/src/mainboard/asus/m5a88-v/dsdt.asl index ff794a0e97..0b5f25af56 100644 --- a/src/mainboard/asus/m5a88-v/dsdt.asl +++ b/src/mainboard/asus/m5a88-v/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "ASUS ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl index 1758e8e01e..aef4be6569 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl +++ b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT Revision: ACPI v2.0 and up */ - "COREv4", /* OEM ID */ - "COREBOOT", /* OEM Table ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20171231 /* OEM Revision */ ) { diff --git a/src/mainboard/asus/p2b-ls/dsdt.asl b/src/mainboard/asus/p2b-ls/dsdt.asl index 9bcf68c3fd..89cc66d834 100644 --- a/src/mainboard/asus/p2b-ls/dsdt.asl +++ b/src/mainboard/asus/p2b-ls/dsdt.asl @@ -21,7 +21,8 @@ #define SUPERIO_SHOW_FDC #define SUPERIO_SHOW_LPT -DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.aml", "DSDT", 2, OEM_ID, ACPI_TABLE_CREATOR, 1) { /* \_PR scope defining the main processor is generated in SSDT. */ diff --git a/src/mainboard/asus/p2b/dsdt.asl b/src/mainboard/asus/p2b/dsdt.asl index c49e584f77..4a58c0781a 100644 --- a/src/mainboard/asus/p2b/dsdt.asl +++ b/src/mainboard/asus/p2b/dsdt.asl @@ -22,7 +22,8 @@ #define SUPERIO_SHOW_FDC #define SUPERIO_SHOW_LPT -DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.aml", "DSDT", 2, OEM_ID, ACPI_TABLE_CREATOR, 1) { /* \_PR scope defining the main processor is generated in SSDT. */ diff --git a/src/mainboard/asus/p5gc-mx/dsdt.asl b/src/mainboard/asus/p5gc-mx/dsdt.asl index 61f0cea72d..7b6bdf81a7 100644 --- a/src/mainboard/asus/p5gc-mx/dsdt.asl +++ b/src/mainboard/asus/p5gc-mx/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/asus/p5qc/dsdt.asl b/src/mainboard/asus/p5qc/dsdt.asl index 93992080f1..d7ce26eab2 100644 --- a/src/mainboard/asus/p5qc/dsdt.asl +++ b/src/mainboard/asus/p5qc/dsdt.asl @@ -16,12 +16,13 @@ #include <southbridge/intel/i82801jx/i82801jx.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x00000001 // OEM revision ) { diff --git a/src/mainboard/asus/p8h61-m_lx/dsdt.asl b/src/mainboard/asus/p8h61-m_lx/dsdt.asl index 1758e8e01e..aef4be6569 100644 --- a/src/mainboard/asus/p8h61-m_lx/dsdt.asl +++ b/src/mainboard/asus/p8h61-m_lx/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT Revision: ACPI v2.0 and up */ - "COREv4", /* OEM ID */ - "COREBOOT", /* OEM Table ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20171231 /* OEM Revision */ ) { diff --git a/src/mainboard/asus/p8h61-m_pro/dsdt.asl b/src/mainboard/asus/p8h61-m_pro/dsdt.asl index ab7409ca3b..6714eb7b2a 100644 --- a/src/mainboard/asus/p8h61-m_pro/dsdt.asl +++ b/src/mainboard/asus/p8h61-m_pro/dsdt.asl @@ -14,12 +14,13 @@ */ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/avalue/eax-785e/acpi/cpstate.asl b/src/mainboard/avalue/eax-785e/acpi/cpstate.asl index afba4ffa93..5d71c8164f 100644 --- a/src/mainboard/avalue/eax-785e/acpi/cpstate.asl +++ b/src/mainboard/avalue/eax-785e/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/avalue/eax-785e/acpi/routing.asl b/src/mainboard/avalue/eax-785e/acpi/routing.asl index 2d57bc55fa..46920552e7 100644 --- a/src/mainboard/avalue/eax-785e/acpi/routing.asl +++ b/src/mainboard/avalue/eax-785e/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/avalue/eax-785e/acpi/usb.asl b/src/mainboard/avalue/eax-785e/acpi/usb.asl index 0f8ca9c0ab..cd76bf1f94 100644 --- a/src/mainboard/avalue/eax-785e/acpi/usb.asl +++ b/src/mainboard/avalue/eax-785e/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/avalue/eax-785e/dsdt.asl b/src/mainboard/avalue/eax-785e/dsdt.asl index 5d959be5cf..4eececb1ab 100644 --- a/src/mainboard/avalue/eax-785e/dsdt.asl +++ b/src/mainboard/avalue/eax-785e/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AVALUE", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/bap/ode_e20XX/acpi/routing.asl b/src/mainboard/bap/ode_e20XX/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/bap/ode_e20XX/acpi/routing.asl +++ b/src/mainboard/bap/ode_e20XX/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl b/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl index 9fba168805..c0202167da 100644 --- a/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl +++ b/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/bap/ode_e20XX/dsdt.asl b/src/mainboard/bap/ode_e20XX/dsdt.asl index e2d02087cc..c4fc93484e 100644 --- a/src/mainboard/bap/ode_e20XX/dsdt.asl +++ b/src/mainboard/bap/ode_e20XX/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/bap/ode_e21XX/acpi/routing.asl b/src/mainboard/bap/ode_e21XX/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/bap/ode_e21XX/acpi/routing.asl +++ b/src/mainboard/bap/ode_e21XX/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl b/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl index 1643fe7cb4..4ebb4b64a6 100644 --- a/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl +++ b/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/bap/ode_e21XX/dsdt.asl b/src/mainboard/bap/ode_e21XX/dsdt.asl index d547afd4ff..0c8fa71095 100644 --- a/src/mainboard/bap/ode_e21XX/dsdt.asl +++ b/src/mainboard/bap/ode_e21XX/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/biostar/a68n_5200/acpi/routing.asl b/src/mainboard/biostar/a68n_5200/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/biostar/a68n_5200/acpi/routing.asl +++ b/src/mainboard/biostar/a68n_5200/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl b/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl index acdc8f8018..513d66d1d7 100644 --- a/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl +++ b/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/biostar/a68n_5200/dsdt.asl b/src/mainboard/biostar/a68n_5200/dsdt.asl index e2d02087cc..c4fc93484e 100644 --- a/src/mainboard/biostar/a68n_5200/dsdt.asl +++ b/src/mainboard/biostar/a68n_5200/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/biostar/am1ml/acpi/routing.asl b/src/mainboard/biostar/am1ml/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/biostar/am1ml/acpi/routing.asl +++ b/src/mainboard/biostar/am1ml/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/biostar/am1ml/acpi/usb_oc.asl b/src/mainboard/biostar/am1ml/acpi/usb_oc.asl index 42785f805e..70a4678a1d 100644 --- a/src/mainboard/biostar/am1ml/acpi/usb_oc.asl +++ b/src/mainboard/biostar/am1ml/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/biostar/am1ml/dsdt.asl b/src/mainboard/biostar/am1ml/dsdt.asl index b8f151501e..945319b8a8 100644 --- a/src/mainboard/biostar/am1ml/dsdt.asl +++ b/src/mainboard/biostar/am1ml/dsdt.asl @@ -16,12 +16,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/compulab/intense_pc/dsdt.asl b/src/mainboard/compulab/intense_pc/dsdt.asl index 85b3e099df..41ff6e65ab 100644 --- a/src/mainboard/compulab/intense_pc/dsdt.asl +++ b/src/mainboard/compulab/intense_pc/dsdt.asl @@ -17,12 +17,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/elmex/pcm205400/acpi/routing.asl b/src/mainboard/elmex/pcm205400/acpi/routing.asl index 6f94b45004..2cf17a7f69 100644 --- a/src/mainboard/elmex/pcm205400/acpi/routing.asl +++ b/src/mainboard/elmex/pcm205400/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl b/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl index 6e9c701a26..a209909b32 100644 --- a/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl +++ b/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/elmex/pcm205400/dsdt.asl b/src/mainboard/elmex/pcm205400/dsdt.asl index 7a6d2e192c..5496288651 100644 --- a/src/mainboard/elmex/pcm205400/dsdt.asl +++ b/src/mainboard/elmex/pcm205400/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl index f48280ebe3..e4be1139f3 100644 --- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl +++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl @@ -13,12 +13,13 @@ * Lesser General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock ( "dsdt.aml", // Output Filename "DSDT", // Signature 0x01, // DSDT Compliance Revision - "CORE", // OEMID - "COREBOOT", // TABLE ID + OEM_ID, + ACPI_TABLE_CREATOR, 0x1 // OEM Revision ) { diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl index bd998bd58e..a861aed55c 100644 --- a/src/mainboard/emulation/qemu-q35/dsdt.asl +++ b/src/mainboard/emulation/qemu-q35/dsdt.asl @@ -19,12 +19,13 @@ * Based on acpi-dsdt.dsl, but heavily modified for q35 chipset. */ +#include <arch/acpi.h> DefinitionBlock ( "dsdt.aml", // Output Filename "DSDT", // Signature 0x01, // DSDT Compliance Revision - "CORE", // OEMID - "COREBOOT", // TABLE ID + OEM_ID, + ACPI_TABLE_CREATOR, 0x2 // OEM Revision ) { diff --git a/src/mainboard/esd/atom15/dsdt.asl b/src/mainboard/esd/atom15/dsdt.asl index 9fad9192e9..2dc713992d 100644 --- a/src/mainboard/esd/atom15/dsdt.asl +++ b/src/mainboard/esd/atom15/dsdt.asl @@ -22,12 +22,13 @@ #define INCLUDE_LPSS 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/facebook/watson/dsdt.asl b/src/mainboard/facebook/watson/dsdt.asl index 88dff41f86..0d9e90dab3 100644 --- a/src/mainboard/facebook/watson/dsdt.asl +++ b/src/mainboard/facebook/watson/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/foxconn/d41s/dsdt.asl b/src/mainboard/foxconn/d41s/dsdt.asl index c89eb75538..8dc11942a0 100644 --- a/src/mainboard/foxconn/d41s/dsdt.asl +++ b/src/mainboard/foxconn/d41s/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/foxconn/g41s-k/dsdt.asl b/src/mainboard/foxconn/g41s-k/dsdt.asl index 8c99025d30..4eade3dfbb 100644 --- a/src/mainboard/foxconn/g41s-k/dsdt.asl +++ b/src/mainboard/foxconn/g41s-k/dsdt.asl @@ -16,12 +16,13 @@ #include <southbridge/intel/i82801gx/i82801gx.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/getac/p470/dsdt.asl b/src/mainboard/getac/p470/dsdt.asl index 33eb3cccbc..4471ef2dbd 100644 --- a/src/mainboard/getac/p470/dsdt.asl +++ b/src/mainboard/getac/p470/dsdt.asl @@ -17,12 +17,13 @@ #define ENABLE_TPM #undef ENABLE_FDC // There is no Floppy for this laptop +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl b/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl index 79f953d9b2..95ed8d913d 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl index 8020bdea6d..51e1ed07ae 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl +++ b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl @@ -11,12 +11,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl index 8020bdea6d..51e1ed07ae 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl +++ b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl @@ -11,12 +11,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl index 8c99025d30..4eade3dfbb 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl +++ b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl @@ -16,12 +16,13 @@ #include <southbridge/intel/i82801gx/i82801gx.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl index 3d14968080..fc69222671 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl @@ -14,12 +14,13 @@ */ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl b/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl +++ b/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/gigabyte/ma785gm/acpi/routing.asl b/src/mainboard/gigabyte/ma785gm/acpi/routing.asl index 02a0a23dbb..072aa2117f 100644 --- a/src/mainboard/gigabyte/ma785gm/acpi/routing.asl +++ b/src/mainboard/gigabyte/ma785gm/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/gigabyte/ma785gm/acpi/usb.asl b/src/mainboard/gigabyte/ma785gm/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/gigabyte/ma785gm/acpi/usb.asl +++ b/src/mainboard/gigabyte/ma785gm/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/gigabyte/ma785gm/dsdt.asl b/src/mainboard/gigabyte/ma785gm/dsdt.asl index c172eb9f2f..3059be9a37 100644 --- a/src/mainboard/gigabyte/ma785gm/dsdt.asl +++ b/src/mainboard/gigabyte/ma785gm/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "GIGA ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl b/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl +++ b/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl b/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl index 02a0a23dbb..072aa2117f 100644 --- a/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl +++ b/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl b/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl +++ b/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/gigabyte/ma785gmt/dsdt.asl b/src/mainboard/gigabyte/ma785gmt/dsdt.asl index c172eb9f2f..3059be9a37 100644 --- a/src/mainboard/gigabyte/ma785gmt/dsdt.asl +++ b/src/mainboard/gigabyte/ma785gmt/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "GIGA ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl b/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl +++ b/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/gigabyte/ma78gm/acpi/routing.asl b/src/mainboard/gigabyte/ma78gm/acpi/routing.asl index ab168ce4fc..abb8ddc6bf 100644 --- a/src/mainboard/gigabyte/ma78gm/acpi/routing.asl +++ b/src/mainboard/gigabyte/ma78gm/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/gigabyte/ma78gm/acpi/usb.asl b/src/mainboard/gigabyte/ma78gm/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/gigabyte/ma78gm/acpi/usb.asl +++ b/src/mainboard/gigabyte/ma78gm/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/gigabyte/ma78gm/dsdt.asl b/src/mainboard/gigabyte/ma78gm/dsdt.asl index c172eb9f2f..3059be9a37 100644 --- a/src/mainboard/gigabyte/ma78gm/dsdt.asl +++ b/src/mainboard/gigabyte/ma78gm/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "GIGA ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/gizmosphere/gizmo/acpi/routing.asl b/src/mainboard/gizmosphere/gizmo/acpi/routing.asl index 4562fe9c3c..447d992351 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi/routing.asl +++ b/src/mainboard/gizmosphere/gizmo/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl b/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl index b48b74b998..c6d570051d 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl +++ b/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/gizmosphere/gizmo/dsdt.asl b/src/mainboard/gizmosphere/gizmo/dsdt.asl index 50fe46a65b..fe6254dcce 100644 --- a/src/mainboard/gizmosphere/gizmo/dsdt.asl +++ b/src/mainboard/gizmosphere/gizmo/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "GIZSPH", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl b/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl +++ b/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl b/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl index 9fba168805..c0202167da 100644 --- a/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl +++ b/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/gizmosphere/gizmo2/dsdt.asl b/src/mainboard/gizmosphere/gizmo2/dsdt.asl index e2d02087cc..c4fc93484e 100644 --- a/src/mainboard/gizmosphere/gizmo2/dsdt.asl +++ b/src/mainboard/gizmosphere/gizmo2/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl index 8c9a020d02..3534c4e4d2 100644 --- a/src/mainboard/google/auron/dsdt.asl +++ b/src/mainboard/google/auron/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl index e356ee47b3..40f58e759b 100644 --- a/src/mainboard/google/beltino/dsdt.asl +++ b/src/mainboard/google/beltino/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl index 08aeda9cdf..8aced6ea2b 100644 --- a/src/mainboard/google/butterfly/dsdt.asl +++ b/src/mainboard/google/butterfly/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl index 3e0f888a59..735a70eeb9 100644 --- a/src/mainboard/google/cyan/dsdt.asl +++ b/src/mainboard/google/cyan/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 /* OEM revision */ ) { diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl index 13873d5859..718ef4759b 100644 --- a/src/mainboard/google/eve/dsdt.asl +++ b/src/mainboard/google/eve/dsdt.asl @@ -16,12 +16,13 @@ #include "ec.h" #include "gpio.h" +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl index 367b0f86e2..50e3791d8d 100644 --- a/src/mainboard/google/fizz/dsdt.asl +++ b/src/mainboard/google/fizz/dsdt.asl @@ -16,12 +16,13 @@ #include <variant/ec.h> #include <variant/gpio.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl index 0b4f9dd441..c1e3616331 100644 --- a/src/mainboard/google/glados/dsdt.asl +++ b/src/mainboard/google/glados/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl index 1108f29b24..db09dc0231 100644 --- a/src/mainboard/google/jecht/dsdt.asl +++ b/src/mainboard/google/jecht/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index f006587c2f..4a3a8ece88 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -16,12 +16,13 @@ #include <variant/ec.h> /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "GOOGLE", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl index 433e2333f9..585c0154cc 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* - * DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) + * #include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) *{ * #include "routing.asl" *} diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl index 7056c2b289..5d7a28c1cb 100644 --- a/src/mainboard/google/link/dsdt.asl +++ b/src/mainboard/google/link/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl index aadcd43d95..88be0a4a2d 100644 --- a/src/mainboard/google/octopus/dsdt.asl +++ b/src/mainboard/google/octopus/dsdt.asl @@ -16,12 +16,13 @@ #include <variant/ec.h> #include <variant/gpio.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl index 7b9847ef36..1d4a4aeec6 100644 --- a/src/mainboard/google/parrot/dsdt.asl +++ b/src/mainboard/google/parrot/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index 3d00524bc1..9d14298830 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -16,12 +16,13 @@ #include <variant/ec.h> #include <variant/gpio.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl index dfc7ce87f6..5b5ea2ec36 100644 --- a/src/mainboard/google/rambi/dsdt.asl +++ b/src/mainboard/google/rambi/dsdt.asl @@ -16,12 +16,13 @@ #define ENABLE_TPM +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl index f97476bded..7ee16ee272 100644 --- a/src/mainboard/google/reef/dsdt.asl +++ b/src/mainboard/google/reef/dsdt.asl @@ -16,12 +16,13 @@ #include <variant/ec.h> #include <variant/gpio.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl index 34484c04a4..91ba815263 100644 --- a/src/mainboard/google/sarien/dsdt.asl +++ b/src/mainboard/google/sarien/dsdt.asl @@ -15,12 +15,13 @@ #include <variant/ec.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 /* OEM revision */ ) { diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl index 6f5f20714e..dcd74d8869 100644 --- a/src/mainboard/google/slippy/dsdt.asl +++ b/src/mainboard/google/slippy/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl index 023b920244..c9f5668310 100644 --- a/src/mainboard/google/stout/dsdt.asl +++ b/src/mainboard/google/stout/dsdt.asl @@ -14,12 +14,14 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/google/zoombini/dsdt.asl b/src/mainboard/google/zoombini/dsdt.asl index 4715196e3e..040cafc769 100644 --- a/src/mainboard/google/zoombini/dsdt.asl +++ b/src/mainboard/google/zoombini/dsdt.asl @@ -18,12 +18,13 @@ #include "variant/ec.h" #include "variant/gpio.h" +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/hp/2570p/dsdt.asl b/src/mainboard/hp/2570p/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/2570p/dsdt.asl +++ b/src/mainboard/hp/2570p/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/2760p/dsdt.asl b/src/mainboard/hp/2760p/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/2760p/dsdt.asl +++ b/src/mainboard/hp/2760p/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/8460p/dsdt.asl b/src/mainboard/hp/8460p/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/8460p/dsdt.asl +++ b/src/mainboard/hp/8460p/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/8470p/dsdt.asl b/src/mainboard/hp/8470p/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/8470p/dsdt.asl +++ b/src/mainboard/hp/8470p/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/8770w/dsdt.asl b/src/mainboard/hp/8770w/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/8770w/dsdt.asl +++ b/src/mainboard/hp/8770w/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/abm/acpi/routing.asl b/src/mainboard/hp/abm/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/hp/abm/acpi/routing.asl +++ b/src/mainboard/hp/abm/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/hp/abm/acpi/usb_oc.asl b/src/mainboard/hp/abm/acpi/usb_oc.asl index 9fba168805..c0202167da 100644 --- a/src/mainboard/hp/abm/acpi/usb_oc.asl +++ b/src/mainboard/hp/abm/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/hp/abm/dsdt.asl b/src/mainboard/hp/abm/dsdt.asl index e2d02087cc..c4fc93484e 100644 --- a/src/mainboard/hp/abm/dsdt.asl +++ b/src/mainboard/hp/abm/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl index 2341fd9e1a..305149d95f 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl +++ b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/folio_9470m/dsdt.asl b/src/mainboard/hp/folio_9470m/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/folio_9470m/dsdt.asl +++ b/src/mainboard/hp/folio_9470m/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl index e486fef6fd..bc9a13f73a 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl +++ b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl @@ -17,12 +17,13 @@ #include "mainboard.h" /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/hp/revolve_810_g1/dsdt.asl b/src/mainboard/hp/revolve_810_g1/dsdt.asl index 987238d3c6..aa3050d29b 100644 --- a/src/mainboard/hp/revolve_810_g1/dsdt.asl +++ b/src/mainboard/hp/revolve_810_g1/dsdt.asl @@ -16,12 +16,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/ibase/mb899/dsdt.asl b/src/mainboard/ibase/mb899/dsdt.asl index e26cfa0d0b..cc56d89aa5 100644 --- a/src/mainboard/ibase/mb899/dsdt.asl +++ b/src/mainboard/ibase/mb899/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv2", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl +++ b/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl index 88d1e4cdda..4c3075c368 100644 --- a/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl +++ b/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl +++ b/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl index cd158fa364..6bb7ff46b1 100644 --- a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl +++ b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "IEI ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/intel/apollolake_rvp/dsdt.asl b/src/mainboard/intel/apollolake_rvp/dsdt.asl index 260cfe3f15..2e3fa7ac44 100644 --- a/src/mainboard/intel/apollolake_rvp/dsdt.asl +++ b/src/mainboard/intel/apollolake_rvp/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 /* OEM revision */ ) { diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl index 88c32801da..128bff61ea 100644 --- a/src/mainboard/intel/baskingridge/dsdt.asl +++ b/src/mainboard/intel/baskingridge/dsdt.asl @@ -16,12 +16,13 @@ #define ENABLE_TPM +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/bayleybay_fsp/dsdt.asl b/src/mainboard/intel/bayleybay_fsp/dsdt.asl index 9fad9192e9..2dc713992d 100644 --- a/src/mainboard/intel/bayleybay_fsp/dsdt.asl +++ b/src/mainboard/intel/bayleybay_fsp/dsdt.asl @@ -22,12 +22,13 @@ #define INCLUDE_LPSS 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/camelbackmountain_fsp/dsdt.asl b/src/mainboard/intel/camelbackmountain_fsp/dsdt.asl index 71b635381a..1248703266 100644 --- a/src/mainboard/intel/camelbackmountain_fsp/dsdt.asl +++ b/src/mainboard/intel/camelbackmountain_fsp/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/cannonlake_rvp/dsdt.asl b/src/mainboard/intel/cannonlake_rvp/dsdt.asl index fb3b6977a8..88b69da1cd 100644 --- a/src/mainboard/intel/cannonlake_rvp/dsdt.asl +++ b/src/mainboard/intel/cannonlake_rvp/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl index 7f2c6d6f4e..2ccf3b7f4f 100644 --- a/src/mainboard/intel/coffeelake_rvp/dsdt.asl +++ b/src/mainboard/intel/coffeelake_rvp/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/d510mo/dsdt.asl b/src/mainboard/intel/d510mo/dsdt.asl index c89eb75538..8dc11942a0 100644 --- a/src/mainboard/intel/d510mo/dsdt.asl +++ b/src/mainboard/intel/d510mo/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/intel/d945gclf/dsdt.asl b/src/mainboard/intel/d945gclf/dsdt.asl index 79f953d9b2..95ed8d913d 100644 --- a/src/mainboard/intel/d945gclf/dsdt.asl +++ b/src/mainboard/intel/d945gclf/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/intel/dcp847ske/dsdt.asl b/src/mainboard/intel/dcp847ske/dsdt.asl index d5ec1477a5..d9d862cb9f 100644 --- a/src/mainboard/intel/dcp847ske/dsdt.asl +++ b/src/mainboard/intel/dcp847ske/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/intel/dg41wv/dsdt.asl b/src/mainboard/intel/dg41wv/dsdt.asl index 8c99025d30..4eade3dfbb 100644 --- a/src/mainboard/intel/dg41wv/dsdt.asl +++ b/src/mainboard/intel/dg41wv/dsdt.asl @@ -16,12 +16,13 @@ #include <southbridge/intel/i82801gx/i82801gx.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/intel/dg43gt/dsdt.asl b/src/mainboard/intel/dg43gt/dsdt.asl index 262cb23c38..3052557302 100644 --- a/src/mainboard/intel/dg43gt/dsdt.asl +++ b/src/mainboard/intel/dg43gt/dsdt.asl @@ -16,12 +16,13 @@ #include <southbridge/intel/i82801jx/i82801jx.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl index 4e78491f61..5965acb1fd 100644 --- a/src/mainboard/intel/emeraldlake2/dsdt.asl +++ b/src/mainboard/intel/emeraldlake2/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/galileo/dsdt.asl b/src/mainboard/intel/galileo/dsdt.asl index da7ac14492..38d787db7d 100644 --- a/src/mainboard/intel/galileo/dsdt.asl +++ b/src/mainboard/intel/galileo/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "Intel", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20160220 // OEM revision ) { diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl index 8e9722bdf3..0adc9a020f 100644 --- a/src/mainboard/intel/glkrvp/dsdt.asl +++ b/src/mainboard/intel/glkrvp/dsdt.asl @@ -16,12 +16,13 @@ #include <variant/ec.h> #include <variant/gpio.h> +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/harcuvar/dsdt.asl b/src/mainboard/intel/harcuvar/dsdt.asl index 5edbb6cce8..d979e9b4bd 100644 --- a/src/mainboard/intel/harcuvar/dsdt.asl +++ b/src/mainboard/intel/harcuvar/dsdt.asl @@ -16,12 +16,13 @@ * */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl index eb5c5abdd6..1d10126ebf 100644 --- a/src/mainboard/intel/icelake_rvp/dsdt.asl +++ b/src/mainboard/intel/icelake_rvp/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl index 903198dbfa..4ddc92a2ea 100644 --- a/src/mainboard/intel/kblrvp/dsdt.asl +++ b/src/mainboard/intel/kblrvp/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl index 0b4f9dd441..c1e3616331 100644 --- a/src/mainboard/intel/kunimitsu/dsdt.asl +++ b/src/mainboard/intel/kunimitsu/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/leafhill/dsdt.asl b/src/mainboard/intel/leafhill/dsdt.asl index d16a289bd7..3be22feb55 100644 --- a/src/mainboard/intel/leafhill/dsdt.asl +++ b/src/mainboard/intel/leafhill/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/littleplains/dsdt.asl b/src/mainboard/intel/littleplains/dsdt.asl index eb661c26e7..8091a4e6c2 100644 --- a/src/mainboard/intel/littleplains/dsdt.asl +++ b/src/mainboard/intel/littleplains/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/minnow3/dsdt.asl b/src/mainboard/intel/minnow3/dsdt.asl index d16a289bd7..3be22feb55 100644 --- a/src/mainboard/intel/minnow3/dsdt.asl +++ b/src/mainboard/intel/minnow3/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/minnowmax/dsdt.asl b/src/mainboard/intel/minnowmax/dsdt.asl index 9fad9192e9..2dc713992d 100644 --- a/src/mainboard/intel/minnowmax/dsdt.asl +++ b/src/mainboard/intel/minnowmax/dsdt.asl @@ -22,12 +22,13 @@ #define INCLUDE_LPSS 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/mohonpeak/dsdt.asl b/src/mainboard/intel/mohonpeak/dsdt.asl index eb661c26e7..8091a4e6c2 100644 --- a/src/mainboard/intel/mohonpeak/dsdt.asl +++ b/src/mainboard/intel/mohonpeak/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl index 59ebc17c7a..2cb8e72d56 100644 --- a/src/mainboard/intel/saddlebrook/dsdt.asl +++ b/src/mainboard/intel/saddlebrook/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl index 7f78e7b542..9380b393a8 100644 --- a/src/mainboard/intel/strago/dsdt.asl +++ b/src/mainboard/intel/strago/dsdt.asl @@ -16,12 +16,13 @@ */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 /* OEM revision */ ) { diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl index fac7b0e928..48ea66b044 100644 --- a/src/mainboard/intel/wtm2/dsdt.asl +++ b/src/mainboard/intel/wtm2/dsdt.asl @@ -16,12 +16,13 @@ #define ENABLE_TPM +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl index 6f94b45004..2cf17a7f69 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl +++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl index 6e9c701a26..a209909b32 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl +++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl index b5d60d4a92..1b66682b73 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl +++ b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "JETWAY", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl b/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl +++ b/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/jetway/pa78vm5/acpi/routing.asl b/src/mainboard/jetway/pa78vm5/acpi/routing.asl index ab168ce4fc..abb8ddc6bf 100644 --- a/src/mainboard/jetway/pa78vm5/acpi/routing.asl +++ b/src/mainboard/jetway/pa78vm5/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/jetway/pa78vm5/acpi/usb.asl b/src/mainboard/jetway/pa78vm5/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/jetway/pa78vm5/acpi/usb.asl +++ b/src/mainboard/jetway/pa78vm5/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/jetway/pa78vm5/dsdt.asl b/src/mainboard/jetway/pa78vm5/dsdt.asl index 1b9d31c44d..4da6035532 100644 --- a/src/mainboard/jetway/pa78vm5/dsdt.asl +++ b/src/mainboard/jetway/pa78vm5/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "JETWAY", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/kontron/986lcd-m/dsdt.asl b/src/mainboard/kontron/986lcd-m/dsdt.asl index 0ddedd5f59..c412c4e2ff 100644 --- a/src/mainboard/kontron/986lcd-m/dsdt.asl +++ b/src/mainboard/kontron/986lcd-m/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl index 794f8d52ab..85ba20bdaa 100644 --- a/src/mainboard/kontron/ktqm77/dsdt.asl +++ b/src/mainboard/kontron/ktqm77/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/g505s/dsdt.asl b/src/mainboard/lenovo/g505s/dsdt.asl index e486fef6fd..bc9a13f73a 100644 --- a/src/mainboard/lenovo/g505s/dsdt.asl +++ b/src/mainboard/lenovo/g505s/dsdt.asl @@ -17,12 +17,13 @@ #include "mainboard.h" /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/lenovo/l520/dsdt.asl b/src/mainboard/lenovo/l520/dsdt.asl index 7648d0591a..b058657bf0 100644 --- a/src/mainboard/lenovo/l520/dsdt.asl +++ b/src/mainboard/lenovo/l520/dsdt.asl @@ -16,12 +16,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 #define THINKPAD_EC_GPE 22 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/lenovo/s230u/dsdt.asl b/src/mainboard/lenovo/s230u/dsdt.asl index 305a6c3d33..aeac7c7567 100644 --- a/src/mainboard/lenovo/s230u/dsdt.asl +++ b/src/mainboard/lenovo/s230u/dsdt.asl @@ -16,12 +16,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 #define THINKPAD_EC_GPE 23 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/lenovo/t400/dsdt.asl b/src/mainboard/lenovo/t400/dsdt.asl index c403a090f2..75f4bce0c5 100644 --- a/src/mainboard/lenovo/t400/dsdt.asl +++ b/src/mainboard/lenovo/t400/dsdt.asl @@ -19,12 +19,13 @@ #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/lenovo/t420/dsdt.asl b/src/mainboard/lenovo/t420/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/t420/dsdt.asl +++ b/src/mainboard/lenovo/t420/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/t420s/dsdt.asl +++ b/src/mainboard/lenovo/t420s/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/t430/dsdt.asl b/src/mainboard/lenovo/t430/dsdt.asl index 6161393dac..3995ee3198 100644 --- a/src/mainboard/lenovo/t430/dsdt.asl +++ b/src/mainboard/lenovo/t430/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/t430s/dsdt.asl +++ b/src/mainboard/lenovo/t430s/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/t520/dsdt.asl +++ b/src/mainboard/lenovo/t520/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/t530/dsdt.asl +++ b/src/mainboard/lenovo/t530/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl index ef69baa71b..8f8c47dae6 100644 --- a/src/mainboard/lenovo/t60/dsdt.asl +++ b/src/mainboard/lenovo/t60/dsdt.asl @@ -19,12 +19,13 @@ #define BRIGHTNESS_DOWN \BRTD #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/lenovo/x131e/dsdt.asl b/src/mainboard/lenovo/x131e/dsdt.asl index 8c907e7b6f..93495bb286 100644 --- a/src/mainboard/lenovo/x131e/dsdt.asl +++ b/src/mainboard/lenovo/x131e/dsdt.asl @@ -16,12 +16,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl index 4901fdad5a..c40669763f 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl +++ b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/lenovo/x200/dsdt.asl b/src/mainboard/lenovo/x200/dsdt.asl index 9bf858de24..8a11ec1954 100644 --- a/src/mainboard/lenovo/x200/dsdt.asl +++ b/src/mainboard/lenovo/x200/dsdt.asl @@ -19,12 +19,13 @@ #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl index 643c803e49..8b2fb78b95 100644 --- a/src/mainboard/lenovo/x201/dsdt.asl +++ b/src/mainboard/lenovo/x201/dsdt.asl @@ -14,18 +14,20 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> #define THINKPAD_EC_GPE 17 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20130325 /* OEM revision */ ) { diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/x220/dsdt.asl +++ b/src/mainboard/lenovo/x220/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl index d554ed9f13..ba96303e6e 100644 --- a/src/mainboard/lenovo/x230/dsdt.asl +++ b/src/mainboard/lenovo/x230/dsdt.asl @@ -21,12 +21,13 @@ #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 #define EC_LENOVO_H8_ME_WORKAROUND 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/lenovo/x60/dsdt.asl b/src/mainboard/lenovo/x60/dsdt.asl index 601fb073a5..2bba47ceec 100644 --- a/src/mainboard/lenovo/x60/dsdt.asl +++ b/src/mainboard/lenovo/x60/dsdt.asl @@ -19,12 +19,13 @@ #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/lenovo/z61t/dsdt.asl b/src/mainboard/lenovo/z61t/dsdt.asl index ef69baa71b..8f8c47dae6 100644 --- a/src/mainboard/lenovo/z61t/dsdt.asl +++ b/src/mainboard/lenovo/z61t/dsdt.asl @@ -19,12 +19,13 @@ #define BRIGHTNESS_DOWN \BRTD #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl b/src/mainboard/lippert/frontrunner-af/acpi/routing.asl index 64d79a5245..985cac0b31 100644 --- a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl +++ b/src/mainboard/lippert/frontrunner-af/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl b/src/mainboard/lippert/frontrunner-af/acpi/usb.asl index 0f8ca9c0ab..cd76bf1f94 100644 --- a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl +++ b/src/mainboard/lippert/frontrunner-af/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl index 8142863772..67f71cbfe7 100644 --- a/src/mainboard/lippert/frontrunner-af/dsdt.asl +++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/lippert/toucan-af/acpi/routing.asl b/src/mainboard/lippert/toucan-af/acpi/routing.asl index d29815273e..997843d3ac 100644 --- a/src/mainboard/lippert/toucan-af/acpi/routing.asl +++ b/src/mainboard/lippert/toucan-af/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/lippert/toucan-af/acpi/usb.asl b/src/mainboard/lippert/toucan-af/acpi/usb.asl index 0f8ca9c0ab..cd76bf1f94 100644 --- a/src/mainboard/lippert/toucan-af/acpi/usb.asl +++ b/src/mainboard/lippert/toucan-af/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl index 10bca98417..df49001676 100644 --- a/src/mainboard/lippert/toucan-af/dsdt.asl +++ b/src/mainboard/lippert/toucan-af/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/msi/ms7721/acpi/cpstate.asl b/src/mainboard/msi/ms7721/acpi/cpstate.asl index 0951006d36..69de2d86a3 100644 --- a/src/mainboard/msi/ms7721/acpi/cpstate.asl +++ b/src/mainboard/msi/ms7721/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/msi/ms7721/dsdt.asl b/src/mainboard/msi/ms7721/dsdt.asl index 3e99df4ccc..cfa74c89ff 100644 --- a/src/mainboard/msi/ms7721/dsdt.asl +++ b/src/mainboard/msi/ms7721/dsdt.asl @@ -16,12 +16,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "MSI ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/msi/ms9652_fam10/dsdt.asl b/src/mainboard/msi/ms9652_fam10/dsdt.asl index 621a8070b4..f555c4d1ff 100644 --- a/src/mainboard/msi/ms9652_fam10/dsdt.asl +++ b/src/mainboard/msi/ms9652_fam10/dsdt.asl @@ -17,7 +17,8 @@ * GNU General Public License for more details. */ -DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE ", "COREBOOT", 1) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.aml", "DSDT", 1, OEM_ID, ACPI_TABLE_CREATOR, 1) { #include "acpi/util.asl" diff --git a/src/mainboard/ocp/monolake/dsdt.asl b/src/mainboard/ocp/monolake/dsdt.asl index 71b635381a..1248703266 100644 --- a/src/mainboard/ocp/monolake/dsdt.asl +++ b/src/mainboard/ocp/monolake/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/ocp/wedge100s/dsdt.asl b/src/mainboard/ocp/wedge100s/dsdt.asl index 71b635381a..1248703266 100644 --- a/src/mainboard/ocp/wedge100s/dsdt.asl +++ b/src/mainboard/ocp/wedge100s/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/opencellular/rotundu/dsdt.asl b/src/mainboard/opencellular/rotundu/dsdt.asl index 9fad9192e9..2dc713992d 100644 --- a/src/mainboard/opencellular/rotundu/dsdt.asl +++ b/src/mainboard/opencellular/rotundu/dsdt.asl @@ -22,12 +22,13 @@ #define INCLUDE_LPSS 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl index 69778e2445..ebe2917f7b 100644 --- a/src/mainboard/packardbell/ms2290/dsdt.asl +++ b/src/mainboard/packardbell/ms2290/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20140108 /* OEM revision */ ) { diff --git a/src/mainboard/pcengines/apu1/acpi/routing.asl b/src/mainboard/pcengines/apu1/acpi/routing.asl index 6c7276a091..9a63d72232 100644 --- a/src/mainboard/pcengines/apu1/acpi/routing.asl +++ b/src/mainboard/pcengines/apu1/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/pcengines/apu1/acpi/usb_oc.asl b/src/mainboard/pcengines/apu1/acpi/usb_oc.asl index 6e9c701a26..a209909b32 100644 --- a/src/mainboard/pcengines/apu1/acpi/usb_oc.asl +++ b/src/mainboard/pcengines/apu1/acpi/usb_oc.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/pcengines/apu1/dsdt.asl b/src/mainboard/pcengines/apu1/dsdt.asl index 17c07d7400..efb584e92c 100644 --- a/src/mainboard/pcengines/apu1/dsdt.asl +++ b/src/mainboard/pcengines/apu1/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "PCENG ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/pcengines/apu2/acpi/routing.asl b/src/mainboard/pcengines/apu2/acpi/routing.asl index 7cb7a2f44c..1fb4c1dfdf 100644 --- a/src/mainboard/pcengines/apu2/acpi/routing.asl +++ b/src/mainboard/pcengines/apu2/acpi/routing.asl @@ -15,7 +15,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/pcengines/apu2/acpi/usb_oc.asl b/src/mainboard/pcengines/apu2/acpi/usb_oc.asl index 1643fe7cb4..4ebb4b64a6 100644 --- a/src/mainboard/pcengines/apu2/acpi/usb_oc.asl +++ b/src/mainboard/pcengines/apu2/acpi/usb_oc.asl @@ -16,7 +16,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/pcengines/apu2/dsdt.asl b/src/mainboard/pcengines/apu2/dsdt.asl index 03bd33ec5e..3bf0ed615b 100644 --- a/src/mainboard/pcengines/apu2/dsdt.asl +++ b/src/mainboard/pcengines/apu2/dsdt.asl @@ -15,12 +15,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/src/mainboard/purism/librem_bdw/dsdt.asl b/src/mainboard/purism/librem_bdw/dsdt.asl index eba4de4a3c..405a6b76f5 100644 --- a/src/mainboard/purism/librem_bdw/dsdt.asl +++ b/src/mainboard/purism/librem_bdw/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, /* DSDT revision: ACPI v2.0 and up */ - "COREv4", /* OEM id */ - "COREBOOT", /* OEM table id */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x20160115 /* OEM revision */ ) { diff --git a/src/mainboard/purism/librem_skl/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl index 1284be5170..a2397a6bf7 100644 --- a/src/mainboard/purism/librem_skl/dsdt.asl +++ b/src/mainboard/purism/librem_skl/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/roda/rk886ex/dsdt.asl b/src/mainboard/roda/rk886ex/dsdt.asl index 0e9bf07689..d33287445d 100644 --- a/src/mainboard/roda/rk886ex/dsdt.asl +++ b/src/mainboard/roda/rk886ex/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/roda/rk9/dsdt.asl b/src/mainboard/roda/rk9/dsdt.asl index 02e63d8b2c..f930a14aa1 100644 --- a/src/mainboard/roda/rk9/dsdt.asl +++ b/src/mainboard/roda/rk9/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20090419 // OEM revision ) { diff --git a/src/mainboard/roda/rv11/dsdt.asl b/src/mainboard/roda/rv11/dsdt.asl index 7a106a9fbc..4859e6b43e 100644 --- a/src/mainboard/roda/rv11/dsdt.asl +++ b/src/mainboard/roda/rv11/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl index 3b5e0492c1..d9de5617f3 100644 --- a/src/mainboard/samsung/lumpy/dsdt.asl +++ b/src/mainboard/samsung/lumpy/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl index 916e71886f..ef5a273f68 100644 --- a/src/mainboard/samsung/stumpy/dsdt.asl +++ b/src/mainboard/samsung/stumpy/dsdt.asl @@ -14,12 +14,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl index 963590814a..dcec95fcbd 100644 --- a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl +++ b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl @@ -17,12 +17,13 @@ #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { diff --git a/src/mainboard/scaleway/tagada/dsdt.asl b/src/mainboard/scaleway/tagada/dsdt.asl index 5edbb6cce8..d979e9b4bd 100644 --- a/src/mainboard/scaleway/tagada/dsdt.asl +++ b/src/mainboard/scaleway/tagada/dsdt.asl @@ -16,12 +16,13 @@ * */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/siemens/mc_apl1/dsdt.asl b/src/mainboard/siemens/mc_apl1/dsdt.asl index b26d135ac4..0eaadb43ad 100644 --- a/src/mainboard/siemens/mc_apl1/dsdt.asl +++ b/src/mainboard/siemens/mc_apl1/dsdt.asl @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/siemens/mc_bdx1/dsdt.asl b/src/mainboard/siemens/mc_bdx1/dsdt.asl index 71b635381a..1248703266 100644 --- a/src/mainboard/siemens/mc_bdx1/dsdt.asl +++ b/src/mainboard/siemens/mc_bdx1/dsdt.asl @@ -15,12 +15,13 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/siemens/mc_tcu3/dsdt.asl b/src/mainboard/siemens/mc_tcu3/dsdt.asl index 9fad9192e9..2dc713992d 100644 --- a/src/mainboard/siemens/mc_tcu3/dsdt.asl +++ b/src/mainboard/siemens/mc_tcu3/dsdt.asl @@ -22,12 +22,13 @@ #define INCLUDE_LPSS 1 +#include <arch/acpi.h> DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI v2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20110725 // OEM revision ) { diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl index 1356379d44..206dd686f5 100644 --- a/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl +++ b/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl @@ -19,7 +19,8 @@ * characteristics. */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { Scope (\_PR) { Processor(CPU0,0,0x808,0x06) { diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl index 0ac6152326..a8c47fdb7c 100644 --- a/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl +++ b/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl @@ -14,7 +14,8 @@ */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "routing.asl" diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl index d4fc433beb..a3ccb97ff9 100644 --- a/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl +++ b/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl @@ -15,7 +15,8 @@ /* simple name description */ /* -DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 +#include <arch/acpi.h> +DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001 ) { #include "usb.asl" diff --git a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl index bde460c49b..84378458eb 100644 --- a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl +++ b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl @@ -14,12 +14,13 @@ */ /* DefinitionBlock Statement */ +#include <arch/acpi.h> DefinitionBlock ( "DSDT.AML", /* Output filename */ "DSDT", /* Signature */ 0x02, /* DSDT Revision, needs to be 2 for 64bit */ - "AMD ", /* OEMID */ - "COREBOOT", /* TABLE ID */ + OEM_ID, + ACPI_TABLE_CREATOR, 0x00010001 /* OEM Revision */ ) { /* Start of ASL file */ diff --git a/util/autoport/main.go b/util/autoport/main.go index 0892b5ebbf..5fcd839940 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -848,12 +848,13 @@ func main() { } dsdt.WriteString( - `DefinitionBlock( + `#include <arch/acpi.h> +DefinitionBlock( "dsdt.aml", "DSDT", 0x02, // DSDT revision: ACPI 2.0 and up - "COREv4", // OEM id - "COREBOOT", // OEM table id + OEM_ID, + ACPI_TABLE_CREATOR, 0x20141018 // OEM revision ) { |