Elyes Haouas has uploaded this change for review.
/: Include <device/mmio.h> instead of <arch/mmio.h>
<device/mmio.h>` chain-include `<arch/mmio.h>.
Change-Id: Ie62e4295ce735a6ca74fbe2499b41aab2e76d506
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
---
M src/device/xhci.c
M src/drivers/emulation/qemu/bochs.c
M src/drivers/intel/ptt/ptt.c
M src/drivers/siemens/nc_fpga/nc_fpga_early.c
M src/include/cpu/x86/lapic.h
M src/mainboard/google/dedede/fw_config.c
M src/mainboard/google/dedede/variants/bugzzy/ramstage.c
M src/mainboard/protectli/vault_bsw/mainboard.c
M src/mainboard/scaleway/tagada/hsio.c
M src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
M src/northbridge/intel/x4x/bootblock.c
M src/security/intel/txt/common.c
M src/security/intel/txt/logging.c
M src/security/intel/txt/ramstage.c
M src/security/intel/txt/romstage.c
M src/soc/amd/common/block/acpi/ivrs.c
M src/soc/amd/common/block/psp/psb.c
M src/soc/amd/common/block/psp/psp_efs.c
M src/soc/amd/common/block/spi/fch_spi.c
M src/soc/amd/picasso/agesa_acpi.c
M src/soc/intel/alderlake/bootblock/update_descriptor.c
M src/southbridge/intel/lynxpoint/uart_init.c
M util/inteltool/inteltool.h
23 files changed, 35 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/70291/1
diff --git a/src/device/xhci.c b/src/device/xhci.c
index 4523b56..0e74993 100644
--- a/src/device/xhci.c
+++ b/src/device/xhci.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <device/pci_def.h>
#include <device/xhci.h>
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index d3b9007..b78773f 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -2,7 +2,7 @@
#include <stdint.h>
#include <arch/io.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/drivers/intel/ptt/ptt.c b/src/drivers/intel/ptt/ptt.c
index 5b0918b..0c682a6 100644
--- a/src/drivers/intel/ptt/ptt.c
+++ b/src/drivers/intel/ptt/ptt.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <soc/pci_devs.h>
#include <device/pci_ops.h>
#include <console/console.h>
diff --git a/src/drivers/siemens/nc_fpga/nc_fpga_early.c b/src/drivers/siemens/nc_fpga/nc_fpga_early.c
index 7d7d54c..8bbfe0a 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga_early.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga_early.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index cfb9c90..54ac50a 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -3,7 +3,7 @@
#ifndef CPU_X86_LAPIC_H
#define CPU_X86_LAPIC_H
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic_def.h>
#include <cpu/x86/msr.h>
diff --git a/src/mainboard/google/dedede/fw_config.c b/src/mainboard/google/dedede/fw_config.c
index 7e5d8fa..6252617 100644
--- a/src/mainboard/google/dedede/fw_config.c
+++ b/src/mainboard/google/dedede/fw_config.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <bootstate.h>
#include <fw_config.h>
#include <gpio.h>
diff --git a/src/mainboard/google/dedede/variants/bugzzy/ramstage.c b/src/mainboard/google/dedede/variants/bugzzy/ramstage.c
index 7844b6e..7053c30 100644
--- a/src/mainboard/google/dedede/variants/bugzzy/ramstage.c
+++ b/src/mainboard/google/dedede/variants/bugzzy/ramstage.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <bootstate.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <delay.h>
#include <bootmode.h>
#include <device/device.h>
diff --git a/src/mainboard/protectli/vault_bsw/mainboard.c b/src/mainboard/protectli/vault_bsw/mainboard.c
index 3c9c45c..78e79c4 100644
--- a/src/mainboard/protectli/vault_bsw/mainboard.c
+++ b/src/mainboard/protectli/vault_bsw/mainboard.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <device/device.h>
#include <soc/iomap.h>
diff --git a/src/mainboard/scaleway/tagada/hsio.c b/src/mainboard/scaleway/tagada/hsio.c
index d305427..d8a8f50 100644
--- a/src/mainboard/scaleway/tagada/hsio.c
+++ b/src/mainboard/scaleway/tagada/hsio.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <hsio.h>
#include <gpio_defs.h>
diff --git a/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c b/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
index 7befa4a..3ba173a 100644
--- a/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
+++ b/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <baseboard/variants.h>
#include <console/console.h>
#include <device/dram/common.h>
diff --git a/src/northbridge/intel/x4x/bootblock.c b/src/northbridge/intel/x4x/bootblock.c
index 71a0609..6c199ad 100644
--- a/src/northbridge/intel/x4x/bootblock.c
+++ b/src/northbridge/intel/x4x/bootblock.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <arch/bootblock.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <assert.h>
#include <device/pci_ops.h>
#include <types.h>
diff --git a/src/security/intel/txt/common.c b/src/security/intel/txt/common.c
index b88062d..6df720a 100644
--- a/src/security/intel/txt/common.c
+++ b/src/security/intel/txt/common.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <cbfs.h>
#include <cpu/x86/cr.h>
diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c
index e3fcb5e..9b4aa80 100644
--- a/src/security/intel/txt/logging.c
+++ b/src/security/intel/txt/logging.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <types.h>
diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c
index 744b05e..2c90b5f 100644
--- a/src/security/intel/txt/ramstage.c
+++ b/src/security/intel/txt/ramstage.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <bootmem.h>
#include <bootstate.h>
#include <cbfs.h>
diff --git a/src/security/intel/txt/romstage.c b/src/security/intel/txt/romstage.c
index e045c9d..8c74e70 100644
--- a/src/security/intel/txt/romstage.c
+++ b/src/security/intel/txt/romstage.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/cpu.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <cpu/intel/common/common.h>
#include <cpu/x86/cr.h>
diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index f0bcef6..cc0e548 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -5,7 +5,7 @@
#include <amdblocks/cpu.h>
#include <amdblocks/data_fabric.h>
#include <amdblocks/ioapic.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <cpu/amd/cpuid.h>
#include <cpu/amd/msr.h>
diff --git a/src/soc/amd/common/block/psp/psb.c b/src/soc/amd/common/block/psp/psb.c
index 58b957d..96a6e420 100644
--- a/src/soc/amd/common/block/psp/psb.c
+++ b/src/soc/amd/common/block/psp/psb.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <bootstate.h>
#include <amdblocks/reset.h>
#include <amdblocks/smn.h>
diff --git a/src/soc/amd/common/block/psp/psp_efs.c b/src/soc/amd/common/block/psp/psp_efs.c
index eacd5f6..72cf33a 100644
--- a/src/soc/amd/common/block/psp/psp_efs.c
+++ b/src/soc/amd/common/block/psp/psp_efs.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/psp_efs.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <assert.h>
#include <boot_device.h>
#include <commonlib/region.h>
diff --git a/src/soc/amd/common/block/spi/fch_spi.c b/src/soc/amd/common/block/spi/fch_spi.c
index 4a8482e..c938623 100644
--- a/src/soc/amd/common/block/spi/fch_spi.c
+++ b/src/soc/amd/common/block/spi/fch_spi.c
@@ -4,7 +4,7 @@
#include <amdblocks/lpc.h>
#include <amdblocks/psp_efs.h>
#include <amdblocks/spi.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <soc/iomap.h>
#include <soc/lpc.h>
diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c
index 839d7c0..32d5e5b 100644
--- a/src/soc/amd/picasso/agesa_acpi.c
+++ b/src/soc/amd/picasso/agesa_acpi.c
@@ -7,7 +7,7 @@
#include <amdblocks/cpu.h>
#include <amdblocks/data_fabric.h>
#include <amdblocks/ioapic.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <cpu/amd/cpuid.h>
#include <cpu/amd/msr.h>
#include <cpu/cpu.h>
diff --git a/src/soc/intel/alderlake/bootblock/update_descriptor.c b/src/soc/intel/alderlake/bootblock/update_descriptor.c
index 9c8ce9c..693b285 100644
--- a/src/soc/intel/alderlake/bootblock/update_descriptor.c
+++ b/src/soc/intel/alderlake/bootblock/update_descriptor.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <cf9_reset.h>
#include <commonlib/region.h>
#include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/uart_init.c b/src/southbridge/intel/lynxpoint/uart_init.c
index 66b9e01..c8c6343 100644
--- a/src/southbridge/intel/lynxpoint/uart_init.c
+++ b/src/southbridge/intel/lynxpoint/uart_init.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/io.h>
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <assert.h>
#include <console/uart.h>
#include <device/pci_def.h>
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 5b40721..b74a8cd 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -4,7 +4,7 @@
#ifndef INTELTOOL_H
#define INTELTOOL_H 1
-#include <arch/mmio.h>
+#include <device/mmio.h>
#include <commonlib/helpers.h>
#include <stdint.h>
To view, visit change 70291. To unsubscribe, or for help writing mail filters, visit settings.