From 8823ba167318e87f74717d0c32e29b58a1ed3eca Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Mon, 5 Dec 2022 08:48:50 +0100
Subject: 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>
---
 src/security/intel/txt/common.c   | 4 ++--
 src/security/intel/txt/logging.c  | 2 +-
 src/security/intel/txt/ramstage.c | 2 +-
 src/security/intel/txt/romstage.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/security/intel/txt')

diff --git a/src/security/intel/txt/common.c b/src/security/intel/txt/common.c
index b88062d42b..b78394add2 100644
--- a/src/security/intel/txt/common.c
+++ b/src/security/intel/txt/common.c
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
-#include <console/console.h>
 #include <cbfs.h>
+#include <console/console.h>
 #include <cpu/x86/cr.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
+#include <device/mmio.h>
 #include <lib.h>
 #include <smp/node.h>
 #include <string.h>
diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c
index e3fcb5e274..6485b867e2 100644
--- a/src/security/intel/txt/logging.c
+++ b/src/security/intel/txt/logging.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
+#include <device/mmio.h>
 #include <types.h>
 
 #include "txt.h"
diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c
index 744b05e410..8a266a4230 100644
--- a/src/security/intel/txt/ramstage.c
+++ b/src/security/intel/txt/ramstage.c
@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <arch/mmio.h>
 #include <bootmem.h>
 #include <bootstate.h>
 #include <cbfs.h>
 #include <console/console.h>
 #include <cpu/intel/common/common.h>
 #include <cpu/x86/smm.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <security/intel/cbnt/cbnt.h>
 #include <types.h>
diff --git a/src/security/intel/txt/romstage.c b/src/security/intel/txt/romstage.c
index e045c9d6fb..e1329dd957 100644
--- a/src/security/intel/txt/romstage.c
+++ b/src/security/intel/txt/romstage.c
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/cpu.h>
-#include <arch/mmio.h>
 #include <console/console.h>
 #include <cpu/intel/common/common.h>
 #include <cpu/x86/cr.h>
 #include <cpu/x86/msr.h>
+#include <device/mmio.h>
 #include <southbridge/intel/common/pmbase.h>
 #include <timer.h>
 #include <types.h>
-- 
cgit v1.2.3