summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2018-11-22 11:15:29 +0100
committerPatrick Georgi <pgeorgi@google.com>2018-11-23 11:00:40 +0000
commit6d19a20f5fb46956d4324dff28ed4b59dc7776a3 (patch)
treee300bcefa622ddf224771971e870f64f7987886d /src/mainboard/google
parente7207593ec1854431375f8c4f5c0f03dd12723fc (diff)
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
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/auron/dsdt.asl5
-rw-r--r--src/mainboard/google/beltino/dsdt.asl5
-rw-r--r--src/mainboard/google/butterfly/dsdt.asl5
-rw-r--r--src/mainboard/google/cyan/dsdt.asl5
-rw-r--r--src/mainboard/google/eve/dsdt.asl5
-rw-r--r--src/mainboard/google/fizz/dsdt.asl5
-rw-r--r--src/mainboard/google/glados/dsdt.asl5
-rw-r--r--src/mainboard/google/jecht/dsdt.asl5
-rw-r--r--src/mainboard/google/kahlee/dsdt.asl5
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl3
-rw-r--r--src/mainboard/google/link/dsdt.asl5
-rw-r--r--src/mainboard/google/octopus/dsdt.asl5
-rw-r--r--src/mainboard/google/parrot/dsdt.asl5
-rw-r--r--src/mainboard/google/poppy/dsdt.asl5
-rw-r--r--src/mainboard/google/rambi/dsdt.asl5
-rw-r--r--src/mainboard/google/reef/dsdt.asl5
-rw-r--r--src/mainboard/google/sarien/dsdt.asl5
-rw-r--r--src/mainboard/google/slippy/dsdt.asl5
-rw-r--r--src/mainboard/google/stout/dsdt.asl6
-rw-r--r--src/mainboard/google/zoombini/dsdt.asl5
20 files changed, 60 insertions, 39 deletions
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
)
{