summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorRicardo Quesada <ricardoq@google.com>2021-07-16 16:39:28 -0700
committerPaul Fagerburg <pfagerburg@chromium.org>2021-08-04 15:15:51 +0000
commit470ca5714f523517087099317ba08ef5fe532ddc (patch)
tree270129296063224e8c99210121c0279e47082661 /src/soc
parent1b9ae1872635eb935b0f68a1a444cce550247339 (diff)
Move post_codes.h to commonlib/console/
Move post_codes.h from include/console to commonlib/include/commonlib/console. This is because post_codes.h is needed by code from util/ (util/ code in different commit). Also, it sorts the #include statements in the files that were modified. BUG=b:172210863 Signed-off-by: Ricardo Quesada <ricardoq@google.com> Change-Id: Ie48c4b1d01474237d007c47832613cf1d4a86ae1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56403 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/alderlake/finalize.c6
-rw-r--r--src/soc/intel/broadwell/finalize.c4
-rw-r--r--src/soc/intel/cannonlake/finalize.c6
-rw-r--r--src/soc/intel/common/acpi/platform.asl2
-rw-r--r--src/soc/intel/elkhartlake/bootblock/pch.c2
-rw-r--r--src/soc/intel/elkhartlake/finalize.c2
-rw-r--r--src/soc/intel/icelake/finalize.c6
-rw-r--r--src/soc/intel/jasperlake/bootblock/pch.c2
-rw-r--r--src/soc/intel/jasperlake/finalize.c6
-rw-r--r--src/soc/intel/skylake/finalize.c8
-rw-r--r--src/soc/intel/tigerlake/bootblock/pch.c4
-rw-r--r--src/soc/intel/tigerlake/finalize.c6
12 files changed, 27 insertions, 27 deletions
diff --git a/src/soc/intel/alderlake/finalize.c b/src/soc/intel/alderlake/finalize.c
index b18d72bb6e..f76e81c356 100644
--- a/src/soc/intel/alderlake/finalize.c
+++ b/src/soc/intel/alderlake/finalize.c
@@ -7,18 +7,17 @@
*/
#include <arch/io.h>
-#include <device/mmio.h>
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <cpu/x86/smm.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h>
#include <intelblocks/tco.h>
#include <intelblocks/thermal.h>
-#include <spi-generic.h>
#include <soc/p2sb.h>
#include <soc/pci_devs.h>
#include <soc/pcr_ids.h>
@@ -26,6 +25,7 @@
#include <soc/smbus.h>
#include <soc/soc_chip.h>
#include <soc/systemagent.h>
+#include <spi-generic.h>
#define CAMERA1_CLK 0x8000 /* Camera 1 Clock */
#define CAMERA2_CLK 0x8080 /* Camera 2 Clock */
diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index 752b8e5296..20bb18736d 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -1,11 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <device/pci_ops.h>
-#include <soc/pci_devs.h>
#include <soc/pch.h>
+#include <soc/pci_devs.h>
#include <soc/systemagent.h>
/*
diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c
index 9b56c0ada2..8888315747 100644
--- a/src/soc/intel/cannonlake/finalize.c
+++ b/src/soc/intel/cannonlake/finalize.c
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <device/mmio.h>
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <cpu/x86/smm.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <intelblocks/cpulib.h>
#include <intelblocks/lpc_lib.h>
@@ -12,13 +12,13 @@
#include <intelblocks/pmclib.h>
#include <intelblocks/tco.h>
#include <intelblocks/thermal.h>
-#include <spi-generic.h>
#include <soc/p2sb.h>
#include <soc/pci_devs.h>
#include <soc/pcr_ids.h>
#include <soc/pm.h>
#include <soc/smbus.h>
#include <soc/systemagent.h>
+#include <spi-generic.h>
#include "chip.h"
diff --git a/src/soc/intel/common/acpi/platform.asl b/src/soc/intel/common/acpi/platform.asl
index 496f184278..3bb2f53046 100644
--- a/src/soc/intel/common/acpi/platform.asl
+++ b/src/soc/intel/common/acpi/platform.asl
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <include/console/post_codes.h>
+#include <commonlib/include/commonlib/console/post_codes.h>
External(\_SB.MPTS, MethodObj)
External(\_SB.MWAK, MethodObj)
diff --git a/src/soc/intel/elkhartlake/bootblock/pch.c b/src/soc/intel/elkhartlake/bootblock/pch.c
index 04849d4c8c..09b78bea3e 100644
--- a/src/soc/intel/elkhartlake/bootblock/pch.c
+++ b/src/soc/intel/elkhartlake/bootblock/pch.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <device/device.h>
#include <device/mmio.h>
#include <device/pci_ops.h>
diff --git a/src/soc/intel/elkhartlake/finalize.c b/src/soc/intel/elkhartlake/finalize.c
index 2e0f2c845e..5c36721ef5 100644
--- a/src/soc/intel/elkhartlake/finalize.c
+++ b/src/soc/intel/elkhartlake/finalize.c
@@ -2,7 +2,7 @@
#include <bootstate.h>
#include <console/console.h>
-#include <console/post_codes.h>
+#include <commonlib/console/post_codes.h>
#include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h>
diff --git a/src/soc/intel/icelake/finalize.c b/src/soc/intel/icelake/finalize.c
index 14dbc06810..bc8386abcc 100644
--- a/src/soc/intel/icelake/finalize.c
+++ b/src/soc/intel/icelake/finalize.c
@@ -1,17 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <device/mmio.h>
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <cpu/x86/smm.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h>
#include <intelblocks/tco.h>
#include <intelblocks/thermal.h>
-#include <spi-generic.h>
#include <soc/p2sb.h>
#include <soc/pci_devs.h>
#include <soc/pcr_ids.h>
@@ -19,6 +18,7 @@
#include <soc/smbus.h>
#include <soc/soc_chip.h>
#include <soc/systemagent.h>
+#include <spi-generic.h>
#define CAMERA1_CLK 0x8000 /* Camera 1 Clock */
#define CAMERA2_CLK 0x8080 /* Camera 2 Clock */
diff --git a/src/soc/intel/jasperlake/bootblock/pch.c b/src/soc/intel/jasperlake/bootblock/pch.c
index df29cd66f0..a3c338e127 100644
--- a/src/soc/intel/jasperlake/bootblock/pch.c
+++ b/src/soc/intel/jasperlake/bootblock/pch.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h>
-#include <console/post_codes.h>
+#include <commonlib/console/post_codes.h>
#include <device/mmio.h>
#include <device/device.h>
#include <device/pci_ops.h>
diff --git a/src/soc/intel/jasperlake/finalize.c b/src/soc/intel/jasperlake/finalize.c
index 8219f0c1d5..07bfee366b 100644
--- a/src/soc/intel/jasperlake/finalize.c
+++ b/src/soc/intel/jasperlake/finalize.c
@@ -1,17 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <device/mmio.h>
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <cpu/x86/smm.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h>
#include <intelblocks/tco.h>
#include <intelblocks/thermal.h>
-#include <spi-generic.h>
#include <soc/p2sb.h>
#include <soc/pci_devs.h>
#include <soc/pcr_ids.h>
@@ -19,6 +18,7 @@
#include <soc/smbus.h>
#include <soc/soc_chip.h>
#include <soc/systemagent.h>
+#include <spi-generic.h>
#define CAMERA1_CLK 0x8000 /* Camera 1 Clock */
#define CAMERA2_CLK 0x8080 /* Camera 2 Clock */
diff --git a/src/soc/intel/skylake/finalize.c b/src/soc/intel/skylake/finalize.c
index 9e9f1ed2cc..83bd3ae8a2 100644
--- a/src/soc/intel/skylake/finalize.c
+++ b/src/soc/intel/skylake/finalize.c
@@ -1,13 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <device/mmio.h>
-#include <device/pci_ops.h>
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <cpu/x86/mp.h>
#include <cpu/x86/smm.h>
+#include <device/mmio.h>
#include <device/pci.h>
+#include <device/pci_ops.h>
#include <intelblocks/cpulib.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/p2sb.h>
@@ -15,7 +15,6 @@
#include <intelblocks/pmclib.h>
#include <intelblocks/tco.h>
#include <intelblocks/thermal.h>
-#include <spi-generic.h>
#include <soc/me.h>
#include <soc/p2sb.h>
#include <soc/pci_devs.h>
@@ -23,6 +22,7 @@
#include <soc/pm.h>
#include <soc/smbus.h>
#include <soc/systemagent.h>
+#include <spi-generic.h>
#include "chip.h"
diff --git a/src/soc/intel/tigerlake/bootblock/pch.c b/src/soc/intel/tigerlake/bootblock/pch.c
index 517ca95ac1..5cb3d630af 100644
--- a/src/soc/intel/tigerlake/bootblock/pch.c
+++ b/src/soc/intel/tigerlake/bootblock/pch.c
@@ -6,10 +6,10 @@
* Chapter number: 2, 3, 4, 27, 28
*/
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
-#include <device/mmio.h>
#include <device/device.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <intelblocks/dmi.h>
#include <intelblocks/fast_spi.h>
diff --git a/src/soc/intel/tigerlake/finalize.c b/src/soc/intel/tigerlake/finalize.c
index 332bddeb77..a28dccd110 100644
--- a/src/soc/intel/tigerlake/finalize.c
+++ b/src/soc/intel/tigerlake/finalize.c
@@ -6,18 +6,17 @@
* Chapter number: 4, 29
*/
-#include <device/mmio.h>
#include <bootstate.h>
+#include <commonlib/console/post_codes.h>
#include <console/console.h>
-#include <console/post_codes.h>
#include <cpu/x86/smm.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h>
#include <intelblocks/tco.h>
#include <intelblocks/thermal.h>
-#include <spi-generic.h>
#include <soc/p2sb.h>
#include <soc/pci_devs.h>
#include <soc/pcr_ids.h>
@@ -25,6 +24,7 @@
#include <soc/smbus.h>
#include <soc/soc_chip.h>
#include <soc/systemagent.h>
+#include <spi-generic.h>
static void pch_finalize(void)
{