aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake/acpi
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2016-02-25 08:45:43 -0800
committerPatrick Georgi <pgeorgi@google.com>2016-03-08 18:43:11 +0100
commit3d3b76b8321ea2106e2bd2595097accbf6ac9eb9 (patch)
tree5f85896a076678d696e6a85fa1e4c5b12618d1e6 /src/soc/intel/skylake/acpi
parent8951ed8b90532d3016a677b5a9a2fb6d9f97ff6a (diff)
skylake: Add and fill out CID1 NVS field
Add a country identifier field to NVS and populate it with the call to wifi_regulatory_domain() which will (by default) do a lookup for the 'region' identifier in VPD on a Chrome OS device. BUG=chrome-os-partner:50516 BRANCH=glados TEST=build and boot on chell Change-Id: Ie7531848e620095732772c22156a85b7f8a6df5c Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: dafdb3760a0302e3effdc0e83977c1bfd5c9d3b2 Original-Change-Id: Ic83ab008045a469d0e0756f7e4d42f1b3894c529 Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/329295 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/13839 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/soc/intel/skylake/acpi')
-rw-r--r--src/soc/intel/skylake/acpi/globalnvs.asl1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl
index 1ea7e53c5f..2bff7d3cf9 100644
--- a/src/soc/intel/skylake/acpi/globalnvs.asl
+++ b/src/soc/intel/skylake/acpi/globalnvs.asl
@@ -63,6 +63,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
DPTE, 8, // 0x30 - Enable DPTF
NHLA, 64, // 0x31 - NHLT Address
NHLL, 32, // 0x39 - NHLT Length
+ CID1, 16, // 0x3d - Wifi Country Identifier
/* ChromeOS specific */
Offset (0x100),