From 6d19a20f5fb46956d4324dff28ed4b59dc7776a3 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Thu, 22 Nov 2018 11:15:29 +0100
Subject: mb: Set coreboot as DSDT's manufacturer model ID

Field 'OEMID' & "OEM Table ID" are related to DSDT table
not to mainboard.
So use macro to set them respectvely to "COREv4" and
"COREBOOT".

Change-Id: I060e07a730e721df4a86128ee89bfe168c69f31e
Signed-off-by: Elyes HAOUAS <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
---
 src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl    | 5 +++--
 src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl      | 5 +++--
 src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl      | 5 +++--
 src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl     | 5 +++--
 src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl     | 5 +++--
 src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl  | 3 ++-
 src/mainboard/gigabyte/ma785gm/acpi/routing.asl  | 3 ++-
 src/mainboard/gigabyte/ma785gm/acpi/usb.asl      | 3 ++-
 src/mainboard/gigabyte/ma785gm/dsdt.asl          | 5 +++--
 src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl | 3 ++-
 src/mainboard/gigabyte/ma785gmt/acpi/routing.asl | 3 ++-
 src/mainboard/gigabyte/ma785gmt/acpi/usb.asl     | 3 ++-
 src/mainboard/gigabyte/ma785gmt/dsdt.asl         | 5 +++--
 src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl   | 3 ++-
 src/mainboard/gigabyte/ma78gm/acpi/routing.asl   | 3 ++-
 src/mainboard/gigabyte/ma78gm/acpi/usb.asl       | 3 ++-
 src/mainboard/gigabyte/ma78gm/dsdt.asl           | 5 +++--
 17 files changed, 42 insertions(+), 25 deletions(-)

(limited to 'src/mainboard/gigabyte')

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 */
-- 
cgit v1.2.3