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>
diff --git a/src/include/console/post_codes.h b/src/commonlib/include/commonlib/console/post_codes.h
similarity index 100%
rename from src/include/console/post_codes.h
rename to src/commonlib/include/commonlib/console/post_codes.h
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 17448fe..8b88a01 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -3,10 +3,10 @@
#ifndef CONSOLE_CONSOLE_H_
#define CONSOLE_CONSOLE_H_
-#include <stdint.h>
#include <arch/cpu.h>
-#include <console/post_codes.h>
+#include <commonlib/console/post_codes.h>
#include <console/vtxprintf.h>
+#include <stdint.h>
/* console.h is supposed to provide the log levels defined in here: */
#include <commonlib/loglevel.h>
diff --git a/src/include/cpu/x86/post_code.h b/src/include/cpu/x86/post_code.h
index de11006..200d93e 100644
--- a/src/include/cpu/x86/post_code.h
+++ b/src/include/cpu/x86/post_code.h
@@ -1,7 +1,7 @@
#ifndef __X86_POST_CODE_H__
#define __X86_POST_CODE_H__
-#include <console/post_codes.h>
+#include <commonlib/console/post_codes.h>
#if CONFIG(POST_IO) && !(ENV_BOOTBLOCK && CONFIG(NO_EARLY_BOOTBLOCK_POSTCODES))
#define post_code(value) \
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index a6ab663..2f782e7 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -5,26 +5,26 @@
* C Bootstrap code for the coreboot
*/
-#include <adainit.h>
#include <acpi/acpi.h>
#include <acpi/acpi_gnvs.h>
+#include <adainit.h>
#include <arch/exception.h>
+#include <boot/tables.h>
#include <bootstate.h>
-#include <console/console.h>
-#include <console/post_codes.h>
-#include <commonlib/helpers.h>
#include <cbmem.h>
-#include <version.h>
+#include <commonlib/console/post_codes.h>
+#include <commonlib/helpers.h>
+#include <console/console.h>
+#include <delay.h>
#include <device/device.h>
#include <device/pci.h>
-#include <delay.h>
-#include <stdlib.h>
-#include <boot/tables.h>
#include <program_loading.h>
+#include <stdlib.h>
+#include <thread.h>
#include <timer.h>
#include <timestamp.h>
-#include <thread.h>
#include <vendorcode/google/chromeos/gnvs.h>
+#include <version.h>
static boot_state_t bs_pre_device(void *arg);
static boot_state_t bs_dev_init_chips(void *arg);
diff --git a/src/soc/intel/alderlake/finalize.c b/src/soc/intel/alderlake/finalize.c
index b18d72b..f76e81c 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 752b8e5..20bb187 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 9b56c0a..8888315 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 496f184..3bb2f53 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 04849d4..09b78be 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 2e0f2c8..5c36721 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 14dbc06..bc8386a 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 df29cd6..a3c338e 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 8219f0c..07bfee3 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 9e9f1ed..83bd3ae 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 517ca95..5cb3d63 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 332bdde..a28dccd 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)
{