diff options
| author | Lijian Zhao <lijian.zhao@intel.com> | 2018-02-11 17:31:07 -0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2018-02-16 04:02:44 +0000 |
| commit | 20123a8838e5c8cdf002237dcf68aa048dc2161b (patch) | |
| tree | 73b9991f60820b412b3930992a34857bb61b70de /src/soc/intel | |
| parent | 3f672323b5f5cd6eaf955a31ebd0f73685f1d257 (diff) | |
soc/intel/cannonlake: Use common PCR ASL
Switch to use common version of PCR asl.
BUG=NONE
TEST=Boot up into chrome OS properly on cannonlake rvp platform.
Change-Id: I4975704434d4743bcc0fb6062115da349166c3a6
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/23699
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/cannonlake/acpi/pcr.asl | 23 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/acpi/southbridge.asl | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/soc/intel/cannonlake/acpi/pcr.asl b/src/soc/intel/cannonlake/acpi/pcr.asl deleted file mode 100644 index 7915226a0a..0000000000 --- a/src/soc/intel/cannonlake/acpi/pcr.asl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2017 Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <intelblocks/pcr.h> - -Method (PCRB, 1, NotSerialized) -{ - Return (Add (CONFIG_PCR_BASE_ADDRESS, - ShiftLeft (Arg0, PCR_PORTID_SHIFT))) -} diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index d0d03f0ac3..8d74da9f42 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -23,7 +23,7 @@ #include "scs.asl" /* PCR access */ -#include "pcr.asl" +#include <soc/intel/common/acpi/pcr.asl> /* GPIO controller */ #include "gpio.asl" |