summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-12-29 09:04:30 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2021-02-11 16:36:15 +0000
commitf6f1215cdbbae04de8f84654d064b376395cf203 (patch)
treecd76ac3b772bd6e128ac6005126ef682fea8c433 /src/southbridge
parentd6ccbb9d48f97dd3bbd4b947fe3bc4857216a363 (diff)
downloadcoreboot-f6f1215cdbbae04de8f84654d064b376395cf203.tar.xz
sb,soc/intel: Drop OSYS from GNVS
The value should be set by OSPM using some combination of _OSI() queris in the \_SB._INI() method. To maintain previous behaviour with this commit, boards where GNVS osys initialisation was removed now do the same in ASL. Change-Id: Id4957b12a72fbf7fa988e7ff039e47abcc072e1c Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49353 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/intel/bd82x6x/acpi/globalnvs.asl2
-rw-r--r--src/southbridge/intel/bd82x6x/include/soc/nvs.h2
-rw-r--r--src/southbridge/intel/i82801gx/acpi/globalnvs.asl2
-rw-r--r--src/southbridge/intel/i82801gx/include/soc/nvs.h2
-rw-r--r--src/southbridge/intel/i82801ix/acpi/globalnvs.asl2
-rw-r--r--src/southbridge/intel/i82801ix/include/soc/nvs.h2
-rw-r--r--src/southbridge/intel/i82801jx/acpi/globalnvs.asl2
-rw-r--r--src/southbridge/intel/i82801jx/include/soc/nvs.h2
-rw-r--r--src/southbridge/intel/ibexpeak/acpi/globalnvs.asl2
-rw-r--r--src/southbridge/intel/ibexpeak/include/soc/nvs.h2
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/globalnvs.asl2
-rw-r--r--src/southbridge/intel/lynxpoint/include/soc/nvs.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
index 0d798b8ca2..56d75b1b91 100644
--- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
@@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
+ , 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter
diff --git a/src/southbridge/intel/bd82x6x/include/soc/nvs.h b/src/southbridge/intel/bd82x6x/include/soc/nvs.h
index 95bf91bcb6..22becfb719 100644
--- a/src/southbridge/intel/bd82x6x/include/soc/nvs.h
+++ b/src/southbridge/intel/bd82x6x/include/soc/nvs.h
@@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- u16 osys; /* 0x00 - Operating System */
+ u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */
diff --git a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
index a1706a725f..c1c5ac2126 100644
--- a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
@@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
+ , 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter
diff --git a/src/southbridge/intel/i82801gx/include/soc/nvs.h b/src/southbridge/intel/i82801gx/include/soc/nvs.h
index 93272dc018..09cb8860ea 100644
--- a/src/southbridge/intel/i82801gx/include/soc/nvs.h
+++ b/src/southbridge/intel/i82801gx/include/soc/nvs.h
@@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- u16 osys; /* 0x00 - Operating System */
+ u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */
diff --git a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
index 55a368eecc..d6fefbe661 100644
--- a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
@@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
+ , 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter
diff --git a/src/southbridge/intel/i82801ix/include/soc/nvs.h b/src/southbridge/intel/i82801ix/include/soc/nvs.h
index 5ae7f25772..6ee61be42b 100644
--- a/src/southbridge/intel/i82801ix/include/soc/nvs.h
+++ b/src/southbridge/intel/i82801ix/include/soc/nvs.h
@@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- u16 osys; /* 0x00 - Operating System */
+ u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */
diff --git a/src/southbridge/intel/i82801jx/acpi/globalnvs.asl b/src/southbridge/intel/i82801jx/acpi/globalnvs.asl
index 2b3e21b188..230d2fc5fe 100644
--- a/src/southbridge/intel/i82801jx/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801jx/acpi/globalnvs.asl
@@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
+ , 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter
diff --git a/src/southbridge/intel/i82801jx/include/soc/nvs.h b/src/southbridge/intel/i82801jx/include/soc/nvs.h
index 96c55882e8..30fb5e04c8 100644
--- a/src/southbridge/intel/i82801jx/include/soc/nvs.h
+++ b/src/southbridge/intel/i82801jx/include/soc/nvs.h
@@ -6,7 +6,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- u16 osys; /* 0x00 - Operating System */
+ u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */
diff --git a/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl b/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
index 8525633e60..d025ce9572 100644
--- a/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
+++ b/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
@@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
+ , 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter
diff --git a/src/southbridge/intel/ibexpeak/include/soc/nvs.h b/src/southbridge/intel/ibexpeak/include/soc/nvs.h
index f552a02b09..0676af27a0 100644
--- a/src/southbridge/intel/ibexpeak/include/soc/nvs.h
+++ b/src/southbridge/intel/ibexpeak/include/soc/nvs.h
@@ -8,7 +8,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- u16 osys; /* 0x00 - Operating System */
+ u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */
diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
index d0c08a14be..d422adbb88 100644
--- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
@@ -7,7 +7,7 @@ Name (\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
+ , 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter
diff --git a/src/southbridge/intel/lynxpoint/include/soc/nvs.h b/src/southbridge/intel/lynxpoint/include/soc/nvs.h
index 5bda60d95a..39b51cc557 100644
--- a/src/southbridge/intel/lynxpoint/include/soc/nvs.h
+++ b/src/southbridge/intel/lynxpoint/include/soc/nvs.h
@@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
- u16 osys; /* 0x00 - Operating System */
+ u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */