summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/cezanne/acpi/globalnvs.asl2
-rw-r--r--src/soc/amd/cezanne/include/soc/nvs.h2
-rw-r--r--src/soc/amd/glinda/acpi/globalnvs.asl2
-rw-r--r--src/soc/amd/glinda/include/soc/nvs.h2
-rw-r--r--src/soc/amd/mendocino/acpi/globalnvs.asl2
-rw-r--r--src/soc/amd/mendocino/include/soc/nvs.h2
-rw-r--r--src/soc/amd/phoenix/acpi/globalnvs.asl2
-rw-r--r--src/soc/amd/phoenix/include/soc/nvs.h2
-rw-r--r--src/soc/amd/picasso/acpi/globalnvs.asl2
-rw-r--r--src/soc/amd/picasso/include/soc/nvs.h2
-rw-r--r--src/soc/amd/stoneyridge/acpi/globalnvs.asl2
-rw-r--r--src/soc/amd/stoneyridge/include/soc/nvs.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/soc/amd/cezanne/acpi/globalnvs.asl b/src/soc/amd/cezanne/acpi/globalnvs.asl
index f4a6c5f69b..352bc71085 100644
--- a/src/soc/amd/cezanne/acpi/globalnvs.asl
+++ b/src/soc/amd/cezanne/acpi/globalnvs.asl
@@ -8,7 +8,7 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ , 32, // 0x00 - 0x03 - coreboot Memory Console
PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
}
diff --git a/src/soc/amd/cezanne/include/soc/nvs.h b/src/soc/amd/cezanne/include/soc/nvs.h
index d1a8e3058f..1d98070de2 100644
--- a/src/soc/amd/cezanne/include/soc/nvs.h
+++ b/src/soc/amd/cezanne/include/soc/nvs.h
@@ -13,7 +13,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
};
diff --git a/src/soc/amd/glinda/acpi/globalnvs.asl b/src/soc/amd/glinda/acpi/globalnvs.asl
index 512f9e8a9f..0e3929d4a9 100644
--- a/src/soc/amd/glinda/acpi/globalnvs.asl
+++ b/src/soc/amd/glinda/acpi/globalnvs.asl
@@ -8,7 +8,7 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ , 32, // 0x00 - 0x03 - coreboot Memory Console
PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
}
diff --git a/src/soc/amd/glinda/include/soc/nvs.h b/src/soc/amd/glinda/include/soc/nvs.h
index 1e663e4ca3..2b1d17bce8 100644
--- a/src/soc/amd/glinda/include/soc/nvs.h
+++ b/src/soc/amd/glinda/include/soc/nvs.h
@@ -13,7 +13,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
};
diff --git a/src/soc/amd/mendocino/acpi/globalnvs.asl b/src/soc/amd/mendocino/acpi/globalnvs.asl
index 4161e5fdf9..7d1774da97 100644
--- a/src/soc/amd/mendocino/acpi/globalnvs.asl
+++ b/src/soc/amd/mendocino/acpi/globalnvs.asl
@@ -8,7 +8,7 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ , 32, // 0x00 - 0x03 - coreboot Memory Console
PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
}
diff --git a/src/soc/amd/mendocino/include/soc/nvs.h b/src/soc/amd/mendocino/include/soc/nvs.h
index 928a310307..3d50e084d9 100644
--- a/src/soc/amd/mendocino/include/soc/nvs.h
+++ b/src/soc/amd/mendocino/include/soc/nvs.h
@@ -13,7 +13,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
};
diff --git a/src/soc/amd/phoenix/acpi/globalnvs.asl b/src/soc/amd/phoenix/acpi/globalnvs.asl
index f5a6aa5006..13f01e5f3a 100644
--- a/src/soc/amd/phoenix/acpi/globalnvs.asl
+++ b/src/soc/amd/phoenix/acpi/globalnvs.asl
@@ -8,7 +8,7 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ , 32, // 0x00 - 0x03 - coreboot Memory Console
PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
}
diff --git a/src/soc/amd/phoenix/include/soc/nvs.h b/src/soc/amd/phoenix/include/soc/nvs.h
index 35f27aab18..6e0de9e4ba 100644
--- a/src/soc/amd/phoenix/include/soc/nvs.h
+++ b/src/soc/amd/phoenix/include/soc/nvs.h
@@ -13,7 +13,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
};
diff --git a/src/soc/amd/picasso/acpi/globalnvs.asl b/src/soc/amd/picasso/acpi/globalnvs.asl
index 2d24b888fd..c322a4c18c 100644
--- a/src/soc/amd/picasso/acpi/globalnvs.asl
+++ b/src/soc/amd/picasso/acpi/globalnvs.asl
@@ -9,7 +9,7 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ , 32, // 0x00 - 0x03 - coreboot Memory Console
PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
TMPS, 8, // 0x14 - Temperature Sensor ID
diff --git a/src/soc/amd/picasso/include/soc/nvs.h b/src/soc/amd/picasso/include/soc/nvs.h
index c5821bbb0b..12cff4b652 100644
--- a/src/soc/amd/picasso/include/soc/nvs.h
+++ b/src/soc/amd/picasso/include/soc/nvs.h
@@ -14,7 +14,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
uint8_t tmps; /* 0x14 - Temperature Sensor ID */
diff --git a/src/soc/amd/stoneyridge/acpi/globalnvs.asl b/src/soc/amd/stoneyridge/acpi/globalnvs.asl
index 7f3fe1b633..0c1c4d1f3c 100644
--- a/src/soc/amd/stoneyridge/acpi/globalnvs.asl
+++ b/src/soc/amd/stoneyridge/acpi/globalnvs.asl
@@ -9,7 +9,7 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- CBMC, 32, // 0x00 - 0x03 - coreboot Memory Console
+ , 32, // 0x00 - 0x03 - coreboot Memory Console
PM1I, 64, // 0x04 - 0x0b - System Wake Source - PM1 Index
GPEI, 64, // 0x0c - 0x13 - GPE Wake Source
TMPS, 8, // 0x14 - Temperature Sensor ID
diff --git a/src/soc/amd/stoneyridge/include/soc/nvs.h b/src/soc/amd/stoneyridge/include/soc/nvs.h
index eaaf1bdc39..226c9f6c2d 100644
--- a/src/soc/amd/stoneyridge/include/soc/nvs.h
+++ b/src/soc/amd/stoneyridge/include/soc/nvs.h
@@ -14,7 +14,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- uint32_t cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
+ uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */
uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */
uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */
uint8_t tmps; /* 0x14 - Temperature Sensor ID */