[coreboot-gerrit] Change in coreboot[master]: soc/intel/cannonlake: Use common PCR ASL

[Lijian Zhao (Code Review)]

Lijian Zhao has uploaded this change for review. ( https://review.coreboot.org/23699


Change subject: soc/intel/cannonlake: Use common PCR ASL
......................................................................

soc/intel/cannonlake: Use common PCR ASL

Switch to use common version of PCR asl.

BUG=NONE
TEST=Boot up into OS.

Change-Id: I4975704434d4743bcc0fb6062115da349166c3a6
Signed-off-by: Lijian Zhao <lijian.zhao at intel.com>
---
D src/soc/intel/cannonlake/acpi/pcr.asl
M src/soc/intel/cannonlake/acpi/southbridge.asl
2 files changed, 1 insertion(+), 24 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/23699/1

diff --git a/src/soc/intel/cannonlake/acpi/pcr.asl b/src/soc/intel/cannonlake/acpi/pcr.asl
deleted file mode 100644
index 7915226..0000000
--- 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 d0d03f0..8d74da9 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"

-- 
To view, visit https://review.coreboot.org/23699
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4975704434d4743bcc0fb6062115da349166c3a6
Gerrit-Change-Number: 23699
Gerrit-PatchSet: 1
Gerrit-Owner: Lijian Zhao <lijian.zhao at intel.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180212/d6425a02/attachment.html>