Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31696 )
Change subject: arch/io.h: Drop includes in fam10 romstages ......................................................................
arch/io.h: Drop includes in fam10 romstages
These files suffer from .c includes.
Change-Id: Id836595290922fcbd108a5ed576fc640b2530711 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/31696 Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/advansus/a785e-i/romstage.c M src/mainboard/amd/mahogany_fam10/romstage.c M src/mainboard/amd/tilapia_fam10/romstage.c M src/mainboard/asus/kfsn4-dre/romstage.c M src/mainboard/asus/m4a78-em/romstage.c M src/mainboard/asus/m4a785-m/romstage.c M src/mainboard/asus/m5a88-v/romstage.c M src/mainboard/avalue/eax-785e/romstage.c M src/mainboard/gigabyte/ma785gm/romstage.c M src/mainboard/gigabyte/ma785gmt/romstage.c M src/mainboard/gigabyte/ma78gm/romstage.c M src/mainboard/iei/kino-780am2-fam10/romstage.c M src/mainboard/jetway/pa78vm5/romstage.c M src/mainboard/msi/ms9652_fam10/romstage.c M src/mainboard/supermicro/h8dmr_fam10/romstage.c M src/mainboard/supermicro/h8qme_fam10/romstage.c M src/mainboard/supermicro/h8scm_fam10/romstage.c M src/mainboard/tyan/s2912_fam10/romstage.c M src/southbridge/amd/amd8111/amd8111_smbus.h M src/southbridge/amd/amd8111/early_ctrl.c M src/southbridge/amd/amd8111/early_smbus.c M src/southbridge/amd/sb800/early_setup.c M src/southbridge/broadcom/bcm5785/early_setup.c M src/southbridge/broadcom/bcm5785/early_smbus.c M src/southbridge/broadcom/bcm5785/smbus.h M src/southbridge/nvidia/ck804/early_setup_car.c M src/southbridge/nvidia/ck804/smbus.h M src/southbridge/nvidia/mcp55/early_setup_car.c M src/southbridge/nvidia/mcp55/smbus.h 29 files changed, 12 insertions(+), 18 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c index bb830b2..92002a6 100644 --- a/src/mainboard/advansus/a785e-i/romstage.c +++ b/src/mainboard/advansus/a785e-i/romstage.c @@ -18,7 +18,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <device/pci_ops.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c index 217e292..67b90a4 100644 --- a/src/mainboard/amd/mahogany_fam10/romstage.c +++ b/src/mainboard/amd/mahogany_fam10/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c index d4a9fe3..a90bac6 100644 --- a/src/mainboard/amd/tilapia_fam10/romstage.c +++ b/src/mainboard/amd/tilapia_fam10/romstage.c @@ -18,7 +18,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c index ae778f2..f6faf17 100644 --- a/src/mainboard/asus/kfsn4-dre/romstage.c +++ b/src/mainboard/asus/kfsn4-dre/romstage.c @@ -21,7 +21,6 @@ #include <string.h> #include <device/pci_def.h> #include <device/pci_ids.h> -#include <arch/io.h> #include <device/pnp_ops.h> #include <device/pci_ops.h> #include <arch/cpu.h> diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c index db81a93..ffe283c 100644 --- a/src/mainboard/asus/m4a78-em/romstage.c +++ b/src/mainboard/asus/m4a78-em/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c index a9117f7..3246bdd 100644 --- a/src/mainboard/asus/m4a785-m/romstage.c +++ b/src/mainboard/asus/m4a785-m/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c index 0fe961f..899814f 100644 --- a/src/mainboard/asus/m5a88-v/romstage.c +++ b/src/mainboard/asus/m5a88-v/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <device/pci_ops.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c index 8e9fedb..f415038 100644 --- a/src/mainboard/avalue/eax-785e/romstage.c +++ b/src/mainboard/avalue/eax-785e/romstage.c @@ -18,7 +18,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <device/pci_ops.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c index 9745895..63a4509 100644 --- a/src/mainboard/gigabyte/ma785gm/romstage.c +++ b/src/mainboard/gigabyte/ma785gm/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c index 19b6022..497acaa 100644 --- a/src/mainboard/gigabyte/ma785gmt/romstage.c +++ b/src/mainboard/gigabyte/ma785gmt/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c index 9119041..a974422 100644 --- a/src/mainboard/gigabyte/ma78gm/romstage.c +++ b/src/mainboard/gigabyte/ma78gm/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c index 77f85d9..734679d 100644 --- a/src/mainboard/iei/kino-780am2-fam10/romstage.c +++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c index 95ac19e..588203c 100644 --- a/src/mainboard/jetway/pa78vm5/romstage.c +++ b/src/mainboard/jetway/pa78vm5/romstage.c @@ -21,7 +21,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index 0b073ed..ab9b0a4 100644 --- a/src/mainboard/msi/ms9652_fam10/romstage.c +++ b/src/mainboard/msi/ms9652_fam10/romstage.c @@ -19,7 +19,6 @@ #include <string.h> #include <device/pci_def.h> #include <device/pci_ids.h> -#include <arch/io.h> #include <device/pnp_ops.h> #include <device/pci_ops.h> #include <arch/cpu.h> diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index 49fec53..d688cc9 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c +++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c @@ -19,7 +19,6 @@ #include <string.h> #include <device/pci_def.h> #include <device/pci_ids.h> -#include <arch/io.h> #include <device/pci_ops.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index 3e09da0..bf3528d 100644 --- a/src/mainboard/supermicro/h8qme_fam10/romstage.c +++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c @@ -19,7 +19,6 @@ #include <string.h> #include <device/pci_def.h> #include <device/pci_ids.h> -#include <arch/io.h> #include <device/pnp_ops.h> #include <device/pci_ops.h> #include <arch/cpu.h> diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c index 7ca47b4..30241a0 100644 --- a/src/mainboard/supermicro/h8scm_fam10/romstage.c +++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <device/pci_def.h> -#include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> #include <console/console.h> diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index 589e06d..084fc48 100644 --- a/src/mainboard/tyan/s2912_fam10/romstage.c +++ b/src/mainboard/tyan/s2912_fam10/romstage.c @@ -19,7 +19,6 @@ #include <string.h> #include <device/pci_def.h> #include <device/pci_ids.h> -#include <arch/io.h> #include <device/pci_ops.h> #include <arch/cpu.h> #include <cpu/x86/lapic.h> diff --git a/src/southbridge/amd/amd8111/amd8111_smbus.h b/src/southbridge/amd/amd8111/amd8111_smbus.h index 33856b3..7386965 100644 --- a/src/southbridge/amd/amd8111/amd8111_smbus.h +++ b/src/southbridge/amd/amd8111/amd8111_smbus.h @@ -11,6 +11,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/smbus_def.h>
#define SMBGSTATUS 0xe0 diff --git a/src/southbridge/amd/amd8111/early_ctrl.c b/src/southbridge/amd/amd8111/early_ctrl.c index 1754d23..8b12d83 100644 --- a/src/southbridge/amd/amd8111/early_ctrl.c +++ b/src/southbridge/amd/amd8111/early_ctrl.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/pci_ids.h> #include <reset.h> #include <southbridge/amd/common/reset.h> diff --git a/src/southbridge/amd/amd8111/early_smbus.c b/src/southbridge/amd/amd8111/early_smbus.c index 15a03f5..2e6781a 100644 --- a/src/southbridge/amd/amd8111/early_smbus.c +++ b/src/southbridge/amd/amd8111/early_smbus.c @@ -11,6 +11,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/pci_ops.h> #include "amd8111_smbus.h"
diff --git a/src/southbridge/amd/sb800/early_setup.c b/src/southbridge/amd/sb800/early_setup.c index d7a6b88..6a575e3 100644 --- a/src/southbridge/amd/sb800/early_setup.c +++ b/src/southbridge/amd/sb800/early_setup.c @@ -16,6 +16,7 @@ #ifndef _SB800_EARLY_SETUP_C_ #define _SB800_EARLY_SETUP_C_
+#include <arch/io.h> #include <reset.h> #include <southbridge/amd/common/amd_defs.h> #include <southbridge/amd/common/reset.h> diff --git a/src/southbridge/broadcom/bcm5785/early_setup.c b/src/southbridge/broadcom/bcm5785/early_setup.c index ee9967d..a8a38f2 100644 --- a/src/southbridge/broadcom/bcm5785/early_setup.c +++ b/src/southbridge/broadcom/bcm5785/early_setup.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <reset.h> #include <southbridge/amd/common/reset.h> #include "bcm5785.h" diff --git a/src/southbridge/broadcom/bcm5785/early_smbus.c b/src/southbridge/broadcom/bcm5785/early_smbus.c index 260f1fc..bcbfb12 100644 --- a/src/southbridge/broadcom/bcm5785/early_smbus.c +++ b/src/southbridge/broadcom/bcm5785/early_smbus.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/pci_ops.h> #include "smbus.h"
diff --git a/src/southbridge/broadcom/bcm5785/smbus.h b/src/southbridge/broadcom/bcm5785/smbus.h index 1c3c9d7..657d97d 100644 --- a/src/southbridge/broadcom/bcm5785/smbus.h +++ b/src/southbridge/broadcom/bcm5785/smbus.h @@ -14,6 +14,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/smbus_def.h>
#define SMBHSTSTAT 0x0 diff --git a/src/southbridge/nvidia/ck804/early_setup_car.c b/src/southbridge/nvidia/ck804/early_setup_car.c index 25faa35..bc1e781 100644 --- a/src/southbridge/nvidia/ck804/early_setup_car.c +++ b/src/southbridge/nvidia/ck804/early_setup_car.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <southbridge/amd/common/reset.h> #include "ck804.h"
diff --git a/src/southbridge/nvidia/ck804/smbus.h b/src/southbridge/nvidia/ck804/smbus.h index 40b8cb7..cec62b3 100644 --- a/src/southbridge/nvidia/ck804/smbus.h +++ b/src/southbridge/nvidia/ck804/smbus.h @@ -14,6 +14,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/smbus_def.h>
#define SMBHSTSTAT 0x1 diff --git a/src/southbridge/nvidia/mcp55/early_setup_car.c b/src/southbridge/nvidia/mcp55/early_setup_car.c index cc5e539..582cb52 100644 --- a/src/southbridge/nvidia/mcp55/early_setup_car.c +++ b/src/southbridge/nvidia/mcp55/early_setup_car.c @@ -15,6 +15,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #ifdef UNUSED_CODE int set_ht_link_buffer_counts_chain(u8 ht_c_num, unsigned vendorid, unsigned val);
diff --git a/src/southbridge/nvidia/mcp55/smbus.h b/src/southbridge/nvidia/mcp55/smbus.h index 274ccfe..f270452 100644 --- a/src/southbridge/nvidia/mcp55/smbus.h +++ b/src/southbridge/nvidia/mcp55/smbus.h @@ -17,6 +17,7 @@ * GNU General Public License for more details. */
+#include <arch/io.h> #include <device/smbus_def.h>
#define SMBHSTSTAT 0x1