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>
This commit is contained in:
Ricardo Quesada 2021-07-16 16:39:28 -07:00 committed by Paul Fagerburg
parent 1b9ae18726
commit 470ca5714f
16 changed files with 39 additions and 39 deletions

View File

@ -3,10 +3,10 @@
#ifndef CONSOLE_CONSOLE_H_ #ifndef CONSOLE_CONSOLE_H_
#define CONSOLE_CONSOLE_H_ #define CONSOLE_CONSOLE_H_
#include <stdint.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <console/post_codes.h> #include <commonlib/console/post_codes.h>
#include <console/vtxprintf.h> #include <console/vtxprintf.h>
#include <stdint.h>
/* console.h is supposed to provide the log levels defined in here: */ /* console.h is supposed to provide the log levels defined in here: */
#include <commonlib/loglevel.h> #include <commonlib/loglevel.h>

View File

@ -1,7 +1,7 @@
#ifndef __X86_POST_CODE_H__ #ifndef __X86_POST_CODE_H__
#define __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)) #if CONFIG(POST_IO) && !(ENV_BOOTBLOCK && CONFIG(NO_EARLY_BOOTBLOCK_POSTCODES))
#define post_code(value) \ #define post_code(value) \

View File

@ -5,26 +5,26 @@
* C Bootstrap code for the coreboot * C Bootstrap code for the coreboot
*/ */
#include <adainit.h>
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <adainit.h>
#include <arch/exception.h> #include <arch/exception.h>
#include <boot/tables.h>
#include <bootstate.h> #include <bootstate.h>
#include <console/console.h>
#include <console/post_codes.h>
#include <commonlib/helpers.h>
#include <cbmem.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/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <delay.h>
#include <stdlib.h>
#include <boot/tables.h>
#include <program_loading.h> #include <program_loading.h>
#include <stdlib.h>
#include <thread.h>
#include <timer.h> #include <timer.h>
#include <timestamp.h> #include <timestamp.h>
#include <thread.h>
#include <vendorcode/google/chromeos/gnvs.h> #include <vendorcode/google/chromeos/gnvs.h>
#include <version.h>
static boot_state_t bs_pre_device(void *arg); static boot_state_t bs_pre_device(void *arg);
static boot_state_t bs_dev_init_chips(void *arg); static boot_state_t bs_dev_init_chips(void *arg);

View File

@ -7,18 +7,17 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <device/mmio.h>
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/tco.h> #include <intelblocks/tco.h>
#include <intelblocks/thermal.h> #include <intelblocks/thermal.h>
#include <spi-generic.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>
@ -26,6 +25,7 @@
#include <soc/smbus.h> #include <soc/smbus.h>
#include <soc/soc_chip.h> #include <soc/soc_chip.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <spi-generic.h>
#define CAMERA1_CLK 0x8000 /* Camera 1 Clock */ #define CAMERA1_CLK 0x8000 /* Camera 1 Clock */
#define CAMERA2_CLK 0x8080 /* Camera 2 Clock */ #define CAMERA2_CLK 0x8080 /* Camera 2 Clock */

View File

@ -1,11 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <soc/pci_devs.h>
#include <soc/pch.h> #include <soc/pch.h>
#include <soc/pci_devs.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
/* /*

View File

@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h>
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
@ -12,13 +12,13 @@
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/tco.h> #include <intelblocks/tco.h>
#include <intelblocks/thermal.h> #include <intelblocks/thermal.h>
#include <spi-generic.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>
#include <soc/pm.h> #include <soc/pm.h>
#include <soc/smbus.h> #include <soc/smbus.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <spi-generic.h>
#include "chip.h" #include "chip.h"

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* 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.MPTS, MethodObj)
External(\_SB.MWAK, MethodObj) External(\_SB.MWAK, MethodObj)

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>

View File

@ -2,7 +2,7 @@
#include <bootstate.h> #include <bootstate.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h> #include <commonlib/console/post_codes.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>

View File

@ -1,17 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h>
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/tco.h> #include <intelblocks/tco.h>
#include <intelblocks/thermal.h> #include <intelblocks/thermal.h>
#include <spi-generic.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>
@ -19,6 +18,7 @@
#include <soc/smbus.h> #include <soc/smbus.h>
#include <soc/soc_chip.h> #include <soc/soc_chip.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <spi-generic.h>
#define CAMERA1_CLK 0x8000 /* Camera 1 Clock */ #define CAMERA1_CLK 0x8000 /* Camera 1 Clock */
#define CAMERA2_CLK 0x8080 /* Camera 2 Clock */ #define CAMERA2_CLK 0x8080 /* Camera 2 Clock */

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h> #include <commonlib/console/post_codes.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>

View File

@ -1,17 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h>
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/tco.h> #include <intelblocks/tco.h>
#include <intelblocks/thermal.h> #include <intelblocks/thermal.h>
#include <spi-generic.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>
@ -19,6 +18,7 @@
#include <soc/smbus.h> #include <soc/smbus.h>
#include <soc/soc_chip.h> #include <soc/soc_chip.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <spi-generic.h>
#define CAMERA1_CLK 0x8000 /* Camera 1 Clock */ #define CAMERA1_CLK 0x8000 /* Camera 1 Clock */
#define CAMERA2_CLK 0x8080 /* Camera 2 Clock */ #define CAMERA2_CLK 0x8080 /* Camera 2 Clock */

View File

@ -1,13 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <cpu/x86/mp.h> #include <cpu/x86/mp.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ops.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
#include <intelblocks/p2sb.h> #include <intelblocks/p2sb.h>
@ -15,7 +15,6 @@
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/tco.h> #include <intelblocks/tco.h>
#include <intelblocks/thermal.h> #include <intelblocks/thermal.h>
#include <spi-generic.h>
#include <soc/me.h> #include <soc/me.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
@ -23,6 +22,7 @@
#include <soc/pm.h> #include <soc/pm.h>
#include <soc/smbus.h> #include <soc/smbus.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <spi-generic.h>
#include "chip.h" #include "chip.h"

View File

@ -6,10 +6,10 @@
* Chapter number: 2, 3, 4, 27, 28 * Chapter number: 2, 3, 4, 27, 28
*/ */
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <device/mmio.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <intelblocks/dmi.h> #include <intelblocks/dmi.h>
#include <intelblocks/fast_spi.h> #include <intelblocks/fast_spi.h>

View File

@ -6,18 +6,17 @@
* Chapter number: 4, 29 * Chapter number: 4, 29
*/ */
#include <device/mmio.h>
#include <bootstate.h> #include <bootstate.h>
#include <commonlib/console/post_codes.h>
#include <console/console.h> #include <console/console.h>
#include <console/post_codes.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/tco.h> #include <intelblocks/tco.h>
#include <intelblocks/thermal.h> #include <intelblocks/thermal.h>
#include <spi-generic.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>
@ -25,6 +24,7 @@
#include <soc/smbus.h> #include <soc/smbus.h>
#include <soc/soc_chip.h> #include <soc/soc_chip.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
#include <spi-generic.h>
static void pch_finalize(void) static void pch_finalize(void)
{ {