treewide: Include <device/mmio.h> instead of <arch/mmio.h>

<device/mmio.h>` chain-include `<arch/mmio.h>:
https://doc.coreboot.org/contributing/coding_style.html#headers-and-includes

Also sort includes while on it.

Change-Id: Ie62e4295ce735a6ca74fbe2499b41aab2e76d506
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70291
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Elyes Haouas 2022-12-05 08:48:50 +01:00 committed by Felix Held
parent 8d1ef734a2
commit 8823ba1673
22 changed files with 35 additions and 34 deletions

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <device/mmio.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/xhci.h> #include <device/xhci.h>
#include <string.h> #include <string.h>

View File

@ -1,16 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <stdint.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ops.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <framebuffer_info.h>
#include <pc80/vga.h> #include <pc80/vga.h>
#include <pc80/vga_io.h> #include <pc80/vga_io.h>
#include <framebuffer_info.h> #include <stdint.h>
/* VGA init. We use the Bochs VESA VBE extensions */ /* VGA init. We use the Bochs VESA VBE extensions */
#define VBE_DISPI_IOPORT_INDEX 0x01CE #define VBE_DISPI_IOPORT_INDEX 0x01CE

View File

@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <soc/pci_devs.h>
#include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <security/intel/txt/txt_register.h> #include <security/intel/txt/txt_register.h>
#include <soc/pci_devs.h>
#include <stdint.h> #include <stdint.h>
#include "ptt.h" #include "ptt.h"

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h> #include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>

View File

@ -3,10 +3,10 @@
#ifndef CPU_X86_LAPIC_H #ifndef CPU_X86_LAPIC_H
#define CPU_X86_LAPIC_H #define CPU_X86_LAPIC_H
#include <arch/mmio.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <cpu/x86/lapic_def.h> #include <cpu/x86/lapic_def.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <device/mmio.h>
#include <halt.h> #include <halt.h>
#include <stdint.h> #include <stdint.h>

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <bootstate.h> #include <bootstate.h>
#include <device/mmio.h>
#include <fw_config.h> #include <fw_config.h>
#include <gpio.h> #include <gpio.h>
#include <intelblocks/gpio.h> #include <intelblocks/gpio.h>

View File

@ -1,13 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <bootstate.h>
#include <arch/mmio.h>
#include <delay.h>
#include <bootmode.h> #include <bootmode.h>
#include <bootstate.h>
#include <delay.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <soc/pci_devs.h>
#include <drivers/intel/gma/i915_reg.h> #include <drivers/intel/gma/i915_reg.h>
#include <soc/pci_devs.h>
static void panel_power_on(uintptr_t igd_bar) static void panel_power_on(uintptr_t igd_bar)
{ {

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <arch/mmio.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#define BIOS_CONTROL_REG 0xFC #define BIOS_CONTROL_REG 0xFC

View File

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <hsio.h> #include <device/mmio.h>
#include <fast_spi_def.h>
#include <gpio_defs.h> #include <gpio_defs.h>
#include <hsio.h>
#include <soc/fiamux.h> #include <soc/fiamux.h>
#include <string.h> #include <string.h>
#include <fast_spi_def.h>
#ifdef __RAMSTAGE__ #ifdef __RAMSTAGE__
static void update_hsio_info_for_m2_slots(size_t num_of_entry, BL_HSIO_INFORMATION *config) static void update_hsio_info_for_m2_slots(size_t num_of_entry, BL_HSIO_INFORMATION *config)

View File

@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <baseboard/variants.h> #include <baseboard/variants.h>
#include <console/console.h> #include <console/console.h>
#include <device/dram/common.h> #include <device/dram/common.h>
#include <device/mmio.h>
#include <hwilib.h> #include <hwilib.h>
#include <soc/meminit.h> #include <soc/meminit.h>
#include <soc/romstage.h> #include <soc/romstage.h>

View File

@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <arch/bootblock.h> #include <arch/bootblock.h>
#include <arch/mmio.h>
#include <assert.h> #include <assert.h>
#include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <types.h> #include <types.h>

View File

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <console/console.h>
#include <cbfs.h> #include <cbfs.h>
#include <console/console.h>
#include <cpu/x86/cr.h> #include <cpu/x86/cr.h>
#include <cpu/x86/mp.h> #include <cpu/x86/mp.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <device/mmio.h>
#include <lib.h> #include <lib.h>
#include <smp/node.h> #include <smp/node.h>
#include <string.h> #include <string.h>

View File

@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <types.h> #include <types.h>
#include "txt.h" #include "txt.h"

View File

@ -1,13 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <arch/mmio.h>
#include <bootmem.h> #include <bootmem.h>
#include <bootstate.h> #include <bootstate.h>
#include <cbfs.h> #include <cbfs.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/intel/common/common.h> #include <cpu/intel/common/common.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <security/intel/cbnt/cbnt.h> #include <security/intel/cbnt/cbnt.h>
#include <types.h> #include <types.h>

View File

@ -1,11 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/cpu.h> #include <arch/cpu.h>
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/intel/common/common.h> #include <cpu/intel/common/common.h>
#include <cpu/x86/cr.h> #include <cpu/x86/cr.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <device/mmio.h>
#include <southbridge/intel/common/pmbase.h> #include <southbridge/intel/common/pmbase.h>
#include <timer.h> #include <timer.h>
#include <types.h> #include <types.h>

View File

@ -6,11 +6,11 @@
#include <amdblocks/data_fabric.h> #include <amdblocks/data_fabric.h>
#include <amdblocks/ioapic.h> #include <amdblocks/ioapic.h>
#include <arch/ioapic.h> #include <arch/ioapic.h>
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/amd/cpuid.h> #include <cpu/amd/cpuid.h>
#include <cpu/amd/msr.h> #include <cpu/amd/msr.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <soc/acpi.h> #include <soc/acpi.h>

View File

@ -1,12 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h>
#include <bootstate.h>
#include <amdblocks/reset.h> #include <amdblocks/reset.h>
#include <amdblocks/smn.h> #include <amdblocks/smn.h>
#include <bootstate.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/amd/msr.h> #include <cpu/amd/msr.h>
#include <device/mmio.h>
#include <types.h> #include <types.h>
#include "psp_def.h" #include "psp_def.h"
#define PSB_STATUS_OFFSET 0x10994 #define PSB_STATUS_OFFSET 0x10994

View File

@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/psp_efs.h> #include <amdblocks/psp_efs.h>
#include <arch/mmio.h>
#include <assert.h> #include <assert.h>
#include <boot_device.h> #include <boot_device.h>
#include <commonlib/region.h> #include <commonlib/region.h>
#include <device/mmio.h>
#include <types.h> #include <types.h>
static struct embedded_firmware *efs; static struct embedded_firmware *efs;

View File

@ -4,8 +4,8 @@
#include <amdblocks/lpc.h> #include <amdblocks/lpc.h>
#include <amdblocks/psp_efs.h> #include <amdblocks/psp_efs.h>
#include <amdblocks/spi.h> #include <amdblocks/spi.h>
#include <arch/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <device/mmio.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/lpc.h> #include <soc/lpc.h>
#include <stdint.h> #include <stdint.h>

View File

@ -7,11 +7,11 @@
#include <amdblocks/cpu.h> #include <amdblocks/cpu.h>
#include <amdblocks/data_fabric.h> #include <amdblocks/data_fabric.h>
#include <amdblocks/ioapic.h> #include <amdblocks/ioapic.h>
#include <arch/mmio.h>
#include <cpu/amd/cpuid.h> #include <cpu/amd/cpuid.h>
#include <cpu/amd/msr.h> #include <cpu/amd/msr.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <device/device.h> #include <device/device.h>
#include <device/mmio.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <FspGuids.h> #include <FspGuids.h>

View File

@ -1,11 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <arch/mmio.h>
#include <cf9_reset.h> #include <cf9_reset.h>
#include <commonlib/region.h> #include <commonlib/region.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/intel/cpu_ids.h> #include <cpu/intel/cpu_ids.h>
#include <device/mmio.h>
#include <fmap.h> #include <fmap.h>
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <soc/bootblock.h> #include <soc/bootblock.h>

View File

@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/io.h> #include <arch/io.h>
#include <arch/mmio.h>
#include <assert.h> #include <assert.h>
#include <console/uart.h> #include <console/uart.h>
#include <device/mmio.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <southbridge/intel/lynxpoint/iobp.h> #include <southbridge/intel/lynxpoint/iobp.h>