From f6f1215cdbbae04de8f84654d064b376395cf203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 29 Dec 2020 09:04:30 +0200 Subject: [PATCH] sb,soc/intel: Drop OSYS from GNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/49353 Reviewed-by: Arthur Heymans Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/acpi/dsdt_top.asl | 3 +++ src/mainboard/acer/g43t-am3/acpi_tables.c | 9 --------- src/mainboard/acer/g43t-am3/dsdt.asl | 2 ++ src/mainboard/asus/p5qc/acpi_tables.c | 9 --------- src/mainboard/asus/p5qc/dsdt.asl | 2 ++ src/mainboard/asus/p5ql-em/acpi_tables.c | 9 --------- src/mainboard/asus/p5ql-em/dsdt.asl | 2 ++ src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c | 9 --------- src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl | 2 ++ src/mainboard/intel/dg43gt/acpi_tables.c | 9 --------- src/mainboard/intel/dg43gt/dsdt.asl | 2 ++ src/soc/intel/baytrail/acpi/globalnvs.asl | 2 +- src/soc/intel/baytrail/include/soc/nvs.h | 2 +- src/soc/intel/braswell/acpi/globalnvs.asl | 2 +- src/soc/intel/braswell/include/soc/nvs.h | 2 +- src/soc/intel/broadwell/include/soc/nvs.h | 2 +- src/soc/intel/broadwell/pch/acpi/globalnvs.asl | 2 +- src/soc/intel/common/block/acpi/acpi/globalnvs.asl | 2 +- src/soc/intel/common/block/include/intelblocks/nvs.h | 2 +- src/soc/intel/denverton_ns/acpi/globalnvs.asl | 2 +- src/soc/intel/denverton_ns/include/soc/nvs.h | 2 +- src/soc/intel/skylake/acpi/globalnvs.asl | 2 +- src/soc/intel/skylake/include/soc/nvs.h | 2 +- src/southbridge/intel/bd82x6x/acpi/globalnvs.asl | 2 +- src/southbridge/intel/bd82x6x/include/soc/nvs.h | 2 +- src/southbridge/intel/i82801gx/acpi/globalnvs.asl | 2 +- src/southbridge/intel/i82801gx/include/soc/nvs.h | 2 +- src/southbridge/intel/i82801ix/acpi/globalnvs.asl | 2 +- src/southbridge/intel/i82801ix/include/soc/nvs.h | 2 +- src/southbridge/intel/i82801jx/acpi/globalnvs.asl | 2 +- src/southbridge/intel/i82801jx/include/soc/nvs.h | 2 +- src/southbridge/intel/ibexpeak/acpi/globalnvs.asl | 2 +- src/southbridge/intel/ibexpeak/include/soc/nvs.h | 2 +- src/southbridge/intel/lynxpoint/acpi/globalnvs.asl | 2 +- src/southbridge/intel/lynxpoint/include/soc/nvs.h | 2 +- 35 files changed, 37 insertions(+), 69 deletions(-) delete mode 100644 src/mainboard/acer/g43t-am3/acpi_tables.c delete mode 100644 src/mainboard/asus/p5qc/acpi_tables.c delete mode 100644 src/mainboard/asus/p5ql-em/acpi_tables.c delete mode 100644 src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c delete mode 100644 src/mainboard/intel/dg43gt/acpi_tables.c diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl index 735389d3bc..ead37d3577 100644 --- a/src/acpi/dsdt_top.asl +++ b/src/acpi/dsdt_top.asl @@ -8,5 +8,8 @@ #include #endif +/* Operating system enumeration. */ +Name (OSYS, 0) + /* Power state (AC = 1) */ Name (PWRS, One) diff --git a/src/mainboard/acer/g43t-am3/acpi_tables.c b/src/mainboard/acer/g43t-am3/acpi_tables.c deleted file mode 100644 index cd44ed207b..0000000000 --- a/src/mainboard/acer/g43t-am3/acpi_tables.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ -} diff --git a/src/mainboard/acer/g43t-am3/dsdt.asl b/src/mainboard/acer/g43t-am3/dsdt.asl index c1dd80e9ee..9094e77182 100644 --- a/src/mainboard/acer/g43t-am3/dsdt.asl +++ b/src/mainboard/acer/g43t-am3/dsdt.asl @@ -11,6 +11,8 @@ DefinitionBlock( ) { #include + + OSYS = 2002 // global NVS and variables #include #include diff --git a/src/mainboard/asus/p5qc/acpi_tables.c b/src/mainboard/asus/p5qc/acpi_tables.c deleted file mode 100644 index cd44ed207b..0000000000 --- a/src/mainboard/asus/p5qc/acpi_tables.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ -} diff --git a/src/mainboard/asus/p5qc/dsdt.asl b/src/mainboard/asus/p5qc/dsdt.asl index ab44aaf65b..6561493c0e 100644 --- a/src/mainboard/asus/p5qc/dsdt.asl +++ b/src/mainboard/asus/p5qc/dsdt.asl @@ -11,6 +11,8 @@ DefinitionBlock( ) { #include + + OSYS = 2002 // global NVS and variables #include #include diff --git a/src/mainboard/asus/p5ql-em/acpi_tables.c b/src/mainboard/asus/p5ql-em/acpi_tables.c deleted file mode 100644 index cd44ed207b..0000000000 --- a/src/mainboard/asus/p5ql-em/acpi_tables.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ -} diff --git a/src/mainboard/asus/p5ql-em/dsdt.asl b/src/mainboard/asus/p5ql-em/dsdt.asl index 4d49c79d9f..8e1b7f9728 100644 --- a/src/mainboard/asus/p5ql-em/dsdt.asl +++ b/src/mainboard/asus/p5ql-em/dsdt.asl @@ -13,6 +13,8 @@ DefinitionBlock( ) { #include + + OSYS = 2002 // global NVS and variables #include #include diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c deleted file mode 100644 index cd44ed207b..0000000000 --- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ -} diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl index 12c14f7a71..2ed7aeb6a6 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl +++ b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl @@ -11,6 +11,8 @@ DefinitionBlock( ) { #include + + OSYS = 2002 // global NVS and variables #include #include diff --git a/src/mainboard/intel/dg43gt/acpi_tables.c b/src/mainboard/intel/dg43gt/acpi_tables.c deleted file mode 100644 index cd44ed207b..0000000000 --- a/src/mainboard/intel/dg43gt/acpi_tables.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ -} diff --git a/src/mainboard/intel/dg43gt/dsdt.asl b/src/mainboard/intel/dg43gt/dsdt.asl index 242db5390b..7b8e27a460 100644 --- a/src/mainboard/intel/dg43gt/dsdt.asl +++ b/src/mainboard/intel/dg43gt/dsdt.asl @@ -11,6 +11,8 @@ DefinitionBlock( ) { #include + + OSYS = 2002 // global NVS and variables #include #include diff --git a/src/soc/intel/baytrail/acpi/globalnvs.asl b/src/soc/intel/baytrail/acpi/globalnvs.asl index 20b7ed4897..e0720d8186 100644 --- a/src/soc/intel/baytrail/acpi/globalnvs.asl +++ b/src/soc/intel/baytrail/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/soc/intel/baytrail/include/soc/nvs.h b/src/soc/intel/baytrail/include/soc/nvs.h index d6136de170..52a744729a 100644 --- a/src/soc/intel/baytrail/include/soc/nvs.h +++ b/src/soc/intel/baytrail/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/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index d13e4a4c88..5642e6afce 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/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/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h index 82ed4f5ad3..ed791010e0 100644 --- a/src/soc/intel/braswell/include/soc/nvs.h +++ b/src/soc/intel/braswell/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/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h index 1f9ae04493..c5d249a7c3 100644 --- a/src/soc/intel/broadwell/include/soc/nvs.h +++ b/src/soc/intel/broadwell/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/soc/intel/broadwell/pch/acpi/globalnvs.asl b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl index 876ac89d57..31905a60f7 100644 --- a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl +++ b/src/soc/intel/broadwell/pch/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/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl index 1290fb0ec2..8c29d1efef 100644 --- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl +++ b/src/soc/intel/common/block/acpi/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 , 8, // 0x03 - Processor Count PPCM, 8, // 0x04 - Max PPC State diff --git a/src/soc/intel/common/block/include/intelblocks/nvs.h b/src/soc/intel/common/block/include/intelblocks/nvs.h index 1bbd4c1660..c98fa012d0 100644 --- a/src/soc/intel/common/block/include/intelblocks/nvs.h +++ b/src/soc/intel/common/block/include/intelblocks/nvs.h @@ -7,7 +7,7 @@ struct __packed global_nvs { /* Miscellaneous */ - u16 osys; /* 0x00 - 0x01 Operating System */ + u16 unused_was_osys; /* 0x00 - 0x01 Operating System */ u8 smif; /* 0x02 - SMI function call ("TRAP") */ u8 unused_was_pcnt; /* 0x03 - Processor Count */ u8 ppcm; /* 0x04 - Max PPC State */ diff --git a/src/soc/intel/denverton_ns/acpi/globalnvs.asl b/src/soc/intel/denverton_ns/acpi/globalnvs.asl index 5bf706df7d..871a4710b0 100644 --- a/src/soc/intel/denverton_ns/acpi/globalnvs.asl +++ b/src/soc/intel/denverton_ns/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/soc/intel/denverton_ns/include/soc/nvs.h b/src/soc/intel/denverton_ns/include/soc/nvs.h index 21915576ca..3940e61426 100644 --- a/src/soc/intel/denverton_ns/include/soc/nvs.h +++ b/src/soc/intel/denverton_ns/include/soc/nvs.h @@ -5,7 +5,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/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl index 1bb27ebd8a..cc7e8e3bec 100644 --- a/src/soc/intel/skylake/acpi/globalnvs.asl +++ b/src/soc/intel/skylake/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/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h index e04364a527..f8149f335d 100644 --- a/src/soc/intel/skylake/include/soc/nvs.h +++ b/src/soc/intel/skylake/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/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 */