diff options
author | Angel Pons <th3fanbus@gmail.com> | 2021-01-10 16:30:40 +0100 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-11 16:38:44 +0000 |
commit | ffdf1f950309876b013824c152f0dfc8b6dccb2a (patch) | |
tree | 5ffbb5b6e827e7cc524fa91f56ddddc47737d8e5 /src/mainboard/lenovo | |
parent | 00f11c0290758cb0f30b54f1a332082f136384ee (diff) | |
download | coreboot-ffdf1f950309876b013824c152f0dfc8b6dccb2a.tar.gz coreboot-ffdf1f950309876b013824c152f0dfc8b6dccb2a.tar.bz2 coreboot-ffdf1f950309876b013824c152f0dfc8b6dccb2a.zip |
sb/intel/ibexpeak: Drop Global NVS support
Was copy-pasted from bd82x6x and no mainboard actually needs it.
The few globals moved outside the GNVS will be removed, relocated or
replaced with acpigen later.
Change-Id: I590a355f1bd1e54365b2e329cfdc62384446a15c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49280
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/lenovo')
-rw-r--r-- | src/mainboard/lenovo/t410/acpi/ec.asl | 4 | ||||
-rw-r--r-- | src/mainboard/lenovo/t410/acpi_tables.c | 15 | ||||
-rw-r--r-- | src/mainboard/lenovo/t410/dsdt.asl | 6 | ||||
-rw-r--r-- | src/mainboard/lenovo/t410/smihandler.c | 1 | ||||
-rw-r--r-- | src/mainboard/lenovo/x201/acpi/ec.asl | 4 | ||||
-rw-r--r-- | src/mainboard/lenovo/x201/acpi_tables.c | 15 | ||||
-rw-r--r-- | src/mainboard/lenovo/x201/dsdt.asl | 6 | ||||
-rw-r--r-- | src/mainboard/lenovo/x201/smihandler.c | 1 |
8 files changed, 14 insertions, 38 deletions
diff --git a/src/mainboard/lenovo/t410/acpi/ec.asl b/src/mainboard/lenovo/t410/acpi/ec.asl index 738c5ca6b151..9f2c2ca1b456 100644 --- a/src/mainboard/lenovo/t410/acpi/ec.asl +++ b/src/mainboard/lenovo/t410/acpi/ec.asl @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +Name(\TCRT, 100) +Name(\TPSV, 90) +Name(\FLVL, 0) + #include <ec/lenovo/h8/acpi/ec.asl> #define H8_BAT_THRESHOLDS_BIT7 diff --git a/src/mainboard/lenovo/t410/acpi_tables.c b/src/mainboard/lenovo/t410/acpi_tables.c deleted file mode 100644 index 36d3e85c1ef1..000000000000 --- a/src/mainboard/lenovo/t410/acpi_tables.c +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi_gnvs.h> -#include <soc/nvs.h> - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - /* The lid is open by default */ - gnvs->lids = 1; - - /* Temperature at which OS will shutdown */ - gnvs->tcrt = 100; - /* Temperature at which OS will throttle CPU */ - gnvs->tpsv = 90; -} diff --git a/src/mainboard/lenovo/t410/dsdt.asl b/src/mainboard/lenovo/t410/dsdt.asl index 63c91527d961..43c7b628b1ec 100644 --- a/src/mainboard/lenovo/t410/dsdt.asl +++ b/src/mainboard/lenovo/t410/dsdt.asl @@ -20,9 +20,6 @@ DefinitionBlock( #include "acpi/platform.asl" - /* global NVS and variables */ - #include <southbridge/intel/ibexpeak/acpi/globalnvs.asl> - /* General Purpose Events */ #include "acpi/gpe.asl" @@ -32,6 +29,9 @@ DefinitionBlock( Device (PCI0) { #include <northbridge/intel/ironlake/acpi/ironlake.asl> + + /* TBD: Remove. */ + Name(\XHCI, 0) #include <southbridge/intel/bd82x6x/acpi/pch.asl> #include <drivers/intel/gma/acpi/default_brightness_levels.asl> diff --git a/src/mainboard/lenovo/t410/smihandler.c b/src/mainboard/lenovo/t410/smihandler.c index ad88a2eb71bb..9a6124ba91b7 100644 --- a/src/mainboard/lenovo/t410/smihandler.c +++ b/src/mainboard/lenovo/t410/smihandler.c @@ -3,7 +3,6 @@ #include <arch/io.h> #include <console/console.h> #include <cpu/x86/smm.h> -#include <soc/nvs.h> #include <southbridge/intel/common/pmutil.h> #include <northbridge/intel/ironlake/ironlake.h> #include <ec/acpi/ec.h> diff --git a/src/mainboard/lenovo/x201/acpi/ec.asl b/src/mainboard/lenovo/x201/acpi/ec.asl index e2dc96eb8642..1ce63054f873 100644 --- a/src/mainboard/lenovo/x201/acpi/ec.asl +++ b/src/mainboard/lenovo/x201/acpi/ec.asl @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +Name(\TCRT, 100) +Name(\TPSV, 90) +Name(\FLVL, 0) + #include <ec/lenovo/h8/acpi/ec.asl> Scope(\_SB.PCI0.LPCB.EC) diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c deleted file mode 100644 index 36d3e85c1ef1..000000000000 --- a/src/mainboard/lenovo/x201/acpi_tables.c +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi_gnvs.h> -#include <soc/nvs.h> - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - /* The lid is open by default */ - gnvs->lids = 1; - - /* Temperature at which OS will shutdown */ - gnvs->tcrt = 100; - /* Temperature at which OS will throttle CPU */ - gnvs->tpsv = 90; -} diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl index 63c91527d961..43c7b628b1ec 100644 --- a/src/mainboard/lenovo/x201/dsdt.asl +++ b/src/mainboard/lenovo/x201/dsdt.asl @@ -20,9 +20,6 @@ DefinitionBlock( #include "acpi/platform.asl" - /* global NVS and variables */ - #include <southbridge/intel/ibexpeak/acpi/globalnvs.asl> - /* General Purpose Events */ #include "acpi/gpe.asl" @@ -32,6 +29,9 @@ DefinitionBlock( Device (PCI0) { #include <northbridge/intel/ironlake/acpi/ironlake.asl> + + /* TBD: Remove. */ + Name(\XHCI, 0) #include <southbridge/intel/bd82x6x/acpi/pch.asl> #include <drivers/intel/gma/acpi/default_brightness_levels.asl> diff --git a/src/mainboard/lenovo/x201/smihandler.c b/src/mainboard/lenovo/x201/smihandler.c index ad88a2eb71bb..9a6124ba91b7 100644 --- a/src/mainboard/lenovo/x201/smihandler.c +++ b/src/mainboard/lenovo/x201/smihandler.c @@ -3,7 +3,6 @@ #include <arch/io.h> #include <console/console.h> #include <cpu/x86/smm.h> -#include <soc/nvs.h> #include <southbridge/intel/common/pmutil.h> #include <northbridge/intel/ironlake/ironlake.h> #include <ec/acpi/ec.h> |