Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69030 )
Change subject: mainboard: Include <cpu/cpu.h> instead of <arch/cpu.h> ......................................................................
mainboard: Include <cpu/cpu.h> instead of <arch/cpu.h>
Also sort includes.
Change-Id: Iccb7f28a2c913ae0983bf224a03610d7fdd13c68 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/google/poppy/variants/nami/mainboard.c M src/mainboard/intel/adlrvp/mainboard.c M src/mainboard/intel/icelake_rvp/spd/spd_util.c M src/mainboard/prodrive/hermes/mainboard.c 5 files changed, 27 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/69030/1
diff --git a/src/mainboard/asus/p5gc-mx/early_init.c b/src/mainboard/asus/p5gc-mx/early_init.c index 22b6f0d..6642011 100644 --- a/src/mainboard/asus/p5gc-mx/early_init.c +++ b/src/mainboard/asus/p5gc-mx/early_init.c @@ -1,17 +1,18 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <stdint.h> #include <cf9_reset.h> -#include <device/pnp_ops.h> -#include <superio/winbond/common/winbond.h> -#include <superio/winbond/w83627dhg/w83627dhg.h> #include <console/console.h> +#include <cpu/cpu.h> +#include <cpu/intel/speedstep.h> +#include <cpu/x86/msr.h> +#include <device/pnp_ops.h> #include <northbridge/intel/i945/i945.h> #include <southbridge/intel/i82801gx/i82801gx.h> -#include <cpu/x86/msr.h> -#include <cpu/intel/speedstep.h> -#include <arch/cpu.h> +#include <stdint.h> +#include <superio/winbond/common/winbond.h> +#include <superio/winbond/w83627dhg/w83627dhg.h> +
#define SERIAL_DEV PNP_DEV(0x2e, W83627DHG_SP1) #define GPIO_DEV PNP_DEV(0x2e, W83627DHG_GPIO2345_V) diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 629469d..b703d40 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> #include <assert.h> #include <baseboard/variants.h> #include <cbfs.h> #include <chip.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/intel/cpu_ids.h> #include <device/device.h> #include <drivers/intel/gma/opregion.h> diff --git a/src/mainboard/intel/adlrvp/mainboard.c b/src/mainboard/intel/adlrvp/mainboard.c index 9862820..c1cbb31 100644 --- a/src/mainboard/intel/adlrvp/mainboard.c +++ b/src/mainboard/intel/adlrvp/mainboard.c @@ -1,18 +1,19 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> #include <baseboard/gpio.h> #include <baseboard/variants.h> +#include <cpu/cpu.h> #include <cpu/intel/cpu_ids.h> #include <device/device.h> #include <drivers/intel/gma/opregion.h> #include <ec/ec.h> -#include <soc/gpio.h> +#include <fw_config.h> #include <smbios.h> +#include <soc/gpio.h> #include <stdint.h> #include <string.h> + #include "board_id.h" -#include <fw_config.h>
const char *smbios_system_sku(void) { diff --git a/src/mainboard/intel/icelake_rvp/spd/spd_util.c b/src/mainboard/intel/icelake_rvp/spd/spd_util.c index 12c3c0f..39dd65a 100644 --- a/src/mainboard/intel/icelake_rvp/spd/spd_util.c +++ b/src/mainboard/intel/icelake_rvp/spd/spd_util.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <intelblocks/mp_init.h> #include <stdint.h> #include <string.h> diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c index b85186d..88cb597 100644 --- a/src/mainboard/prodrive/hermes/mainboard.c +++ b/src/mainboard/prodrive/hermes/mainboard.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpigen.h> -#include <arch/cpu.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> +#include <cpu/cpu.h> #include <crc_byte.h> #include <device/device.h> #include <device/dram/spd.h>