AGESA binaryPI: Clean up amdfamXX.h include

Change-Id: Iba8b8d33e1f10e28745234988d97d4fafd04c798
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21583
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>

109 files changed, 0 insertions, 148 deletions

diff --git a/src/include/cpu/amd/amdfam12.h b/src/include/cpu/amd/amdfam12.h
index 26b283c5f8..3838ce1b84 100644
--- a/src/include/cpu/amd/amdfam12.h
+++ b/src/include/cpu/amd/amdfam12.h
@@ -16,8 +16,6 @@
 #ifndef CPU_AMD_FAM12_H
 #define CPU_AMD_FAM12_H
 
-#include <cpu/x86/msr.h>
-
 #define HWCR_MSR			0xC0010015
 #define NB_CFG_MSR			0xC001001f
 #define LS_CFG_MSR			0xC0011020
@@ -29,12 +27,4 @@
 #define CPU_ID_FEATURES_MSR		0xC0011004
 #define CPU_ID_EXT_FEATURES_MSR		0xC0011005
 
-#if defined(__PRE_RAM__)
-void wait_all_core0_started(void);
-void wait_all_other_cores_started(u32 bsp_apicid);
-void wait_all_aps_started(u32 bsp_apicid);
-void allow_all_aps_stop(u32 bsp_apicid);
-#endif
-void get_bus_conf(void);
-
 #endif /* CPU_AMD_FAM12_H */
diff --git a/src/include/cpu/amd/amdfam14.h b/src/include/cpu/amd/amdfam14.h
index 12eb62524f..ec5d34b9e9 100644
--- a/src/include/cpu/amd/amdfam14.h
+++ b/src/include/cpu/amd/amdfam14.h
@@ -16,8 +16,6 @@
 #ifndef CPU_AMD_FAM14_H
 #define CPU_AMD_FAM14_H
 
-#include <cpu/x86/msr.h>
-
 #define HWCR_MSR			0xC0010015
 #define NB_CFG_MSR			0xC001001f
 #define LS_CFG_MSR			0xC0011020
@@ -29,13 +27,4 @@
 #define CPU_ID_FEATURES_MSR		0xC0011004
 #define CPU_ID_EXT_FEATURES_MSR		0xC0011005
 
-#if defined(__PRE_RAM__)
-void wait_all_core0_started(void);
-void wait_all_other_cores_started(u32 bsp_apicid);
-void wait_all_aps_started(u32 bsp_apicid);
-void allow_all_aps_stop(u32 bsp_apicid);
-#endif
-void get_bus_conf(void);
-u32 get_initial_apicid(void);
-
 #endif /* CPU_AMD_FAM14_H */
diff --git a/src/include/cpu/amd/amdfam15.h b/src/include/cpu/amd/amdfam15.h
index 37fbc49b72..ad3189f268 100644
--- a/src/include/cpu/amd/amdfam15.h
+++ b/src/include/cpu/amd/amdfam15.h
@@ -16,8 +16,6 @@
 #ifndef CPU_AMD_FAM15_H
 #define CPU_AMD_FAM15_H
 
-#include <cpu/x86/msr.h>
-
 #define MCI_STATUS			0x00000401
 #define MSR_SMM_BASE			0xC0010111
 #define MSR_SMM_MASK			0xC0010113
@@ -37,13 +35,4 @@
 
 #define CORE_PERF_BOOST_CTRL		0x15C
 
-#if defined(__PRE_RAM__)
-void wait_all_core0_started(void);
-void wait_all_other_cores_started(u32 bsp_apicid);
-void wait_all_aps_started(u32 bsp_apicid);
-void allow_all_aps_stop(u32 bsp_apicid);
-#endif
-u32 get_initial_apicid(void);
-void get_bus_conf(void);
-
 #endif /* CPU_AMD_FAM15_H */
diff --git a/src/include/cpu/amd/amdfam16.h b/src/include/cpu/amd/amdfam16.h
index 083b171941..861e518db0 100644
--- a/src/include/cpu/amd/amdfam16.h
+++ b/src/include/cpu/amd/amdfam16.h
@@ -16,8 +16,6 @@
 #ifndef CPU_AMD_FAM16_H
 #define CPU_AMD_FAM16_H
 
-#include <cpu/x86/msr.h>
-
 #define MCI_STATUS			0x00000401
 #define HWCR_MSR			0xC0010015
 #define NB_CFG_MSR			0xC001001f
@@ -31,13 +29,4 @@
 #define CPU_ID_FEATURES_MSR		0xC0011004
 #define CPU_ID_EXT_FEATURES_MSR		0xC0011005
 
-#if defined(__PRE_RAM__)
-void wait_all_core0_started(void);
-void wait_all_other_cores_started(u32 bsp_apicid);
-void wait_all_aps_started(u32 bsp_apicid);
-void allow_all_aps_stop(u32 bsp_apicid);
-#endif
-u32 get_initial_apicid(void);
-void get_bus_conf(void);
-
 #endif /* CPU_AMD_FAM16_H */
diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index 61891b63e9..f94555658e 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 #define IO_APIC2_ADDR 0xFEC20000
 
diff --git a/src/mainboard/amd/bettong/irq_tables.c b/src/mainboard/amd/bettong/irq_tables.c
index dd24f73835..2a961a4a15 100644
--- a/src/mainboard/amd/bettong/irq_tables.c
+++ b/src/mainboard/amd/bettong/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/bettong/mptable.c b/src/mainboard/amd/bettong/mptable.c
index 9e73e7798a..6f79a544c2 100644
--- a/src/mainboard/amd/bettong/mptable.c
+++ b/src/mainboard/amd/bettong/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include "southbridge/amd/pi/hudson/hudson.h"
diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
index d448080637..80a17cc13f 100644
--- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/db-ft3b-lc/irq_tables.c b/src/mainboard/amd/db-ft3b-lc/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/amd/db-ft3b-lc/irq_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/db-ft3b-lc/mptable.c b/src/mainboard/amd/db-ft3b-lc/mptable.c
index dac38976c4..020bc270c3 100644
--- a/src/mainboard/amd/db-ft3b-lc/mptable.c
+++ b/src/mainboard/amd/db-ft3b-lc/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c
index 5e2b22f833..ec6c41fa3c 100644
--- a/src/mainboard/amd/dinar/acpi_tables.c
+++ b/src/mainboard/amd/dinar/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
-#include <cpu/amd/amdfam15.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/dinar/irq_tables.c b/src/mainboard/amd/dinar/irq_tables.c
index cfa48b56bc..6ca70dea4c 100644
--- a/src/mainboard/amd/dinar/irq_tables.c
+++ b/src/mainboard/amd/dinar/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam15.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index a8b53d099e..b5df41ea49 100644
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
-#include <cpu/amd/amdfam15.h>
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/amd/gardenia/irq_tables.c b/src/mainboard/amd/gardenia/irq_tables.c
index e8b906eb0a..bf1daec8a6 100644
--- a/src/mainboard/amd/gardenia/irq_tables.c
+++ b/src/mainboard/amd/gardenia/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/gardenia/mptable.c b/src/mainboard/amd/gardenia/mptable.c
index c32955866e..5c07186327 100644
--- a/src/mainboard/amd/gardenia/mptable.c
+++ b/src/mainboard/amd/gardenia/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <soc/southbridge.h>
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index 3f8a4aecd4..2aaa6080fa 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/inagua/irq_tables.c b/src/mainboard/amd/inagua/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/amd/inagua/irq_tables.c
+++ b/src/mainboard/amd/inagua/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c
index 2deb219a00..50471ab5a8 100644
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 
 u8 intr_data[] = {
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index a8c02de437..77f8dda6aa 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam15.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/lamar/irq_tables.c b/src/mainboard/amd/lamar/irq_tables.c
index 9609db33ed..be8c702736 100644
--- a/src/mainboard/amd/lamar/irq_tables.c
+++ b/src/mainboard/amd/lamar/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam15.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index b25e674c97..92b4d273f4 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 943a461e62..73f305a190 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/olivehill/irq_tables.c b/src/mainboard/amd/olivehill/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/amd/olivehill/irq_tables.c
+++ b/src/mainboard/amd/olivehill/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index 9ae75aee08..fb8a7ce08c 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include "southbridge/amd/agesa/hudson/hudson.h"
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index d448080637..80a17cc13f 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/olivehillplus/irq_tables.c b/src/mainboard/amd/olivehillplus/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/amd/olivehillplus/irq_tables.c
+++ b/src/mainboard/amd/olivehillplus/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/olivehillplus/mptable.c b/src/mainboard/amd/olivehillplus/mptable.c
index 925526c689..8b0ae30764 100644
--- a/src/mainboard/amd/olivehillplus/mptable.c
+++ b/src/mainboard/amd/olivehillplus/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index d8003f855f..7631cb6e12 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam15.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/parmer/irq_tables.c b/src/mainboard/amd/parmer/irq_tables.c
index c0752676df..e18e47842a 100644
--- a/src/mainboard/amd/parmer/irq_tables.c
+++ b/src/mainboard/amd/parmer/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam15.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index e10fc8911d..60b1772c4b 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include "southbridge/amd/agesa/hudson/hudson.h"
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index a9026531fd..478e48fced 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/persimmon/irq_tables.c b/src/mainboard/amd/persimmon/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/amd/persimmon/irq_tables.c
+++ b/src/mainboard/amd/persimmon/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 8e954cd0d1..4f533a40cb 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index 3f8a4aecd4..2aaa6080fa 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/south_station/irq_tables.c b/src/mainboard/amd/south_station/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/amd/south_station/irq_tables.c
+++ b/src/mainboard/amd/south_station/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c
index c24e42cf93..781230f7ab 100644
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 
 
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index d8003f855f..7631cb6e12 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam15.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/thatcher/irq_tables.c b/src/mainboard/amd/thatcher/irq_tables.c
index c0752676df..e18e47842a 100644
--- a/src/mainboard/amd/thatcher/irq_tables.c
+++ b/src/mainboard/amd/thatcher/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam15.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index 26402847b8..2c3224496f 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include "southbridge/amd/agesa/hudson/hudson.h"
diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index 050b311188..4e2c4546f9 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam12.h>
 
 extern u32 apicid_sb900;
 
diff --git a/src/mainboard/amd/torpedo/irq_tables.c b/src/mainboard/amd/torpedo/irq_tables.c
index cedac009d0..9ebe58ae65 100644
--- a/src/mainboard/amd/torpedo/irq_tables.c
+++ b/src/mainboard/amd/torpedo/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam12.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index 8091ffbc3d..3f0e5b004d 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
-#include <cpu/amd/amdfam12.h>
 #include "SbPlatform.h"
 
 #define IO_APIC_ID CONFIG_MAX_CPUS
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index 3f8a4aecd4..2aaa6080fa 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/union_station/irq_tables.c b/src/mainboard/amd/union_station/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/amd/union_station/irq_tables.c
+++ b/src/mainboard/amd/union_station/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c
index c24e42cf93..781230f7ab 100644
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 
 
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index 83daa6eb38..07820969f1 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam14.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <string.h>
diff --git a/src/mainboard/asrock/e350m1/irq_tables.c b/src/mainboard/asrock/e350m1/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/asrock/e350m1/irq_tables.c
+++ b/src/mainboard/asrock/e350m1/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c
index eef3554dd9..8cd31effb5 100644
--- a/src/mainboard/asrock/e350m1/mptable.c
+++ b/src/mainboard/asrock/e350m1/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam14.h>
 #include <device/pci.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 943a461e62..73f305a190 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asrock/imb-a180/irq_tables.c b/src/mainboard/asrock/imb-a180/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/asrock/imb-a180/irq_tables.c
+++ b/src/mainboard/asrock/imb-a180/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c
index 6241282d2c..6869519490 100644
--- a/src/mainboard/asrock/imb-a180/mptable.c
+++ b/src/mainboard/asrock/imb-a180/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include "southbridge/amd/agesa/hudson/hudson.h"
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index 53ad1bcf00..783bc54a6a 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam15.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <string.h>
diff --git a/src/mainboard/asus/f2a85-m/irq_tables.c b/src/mainboard/asus/f2a85-m/irq_tables.c
index 458c15757b..88d2160000 100644
--- a/src/mainboard/asus/f2a85-m/irq_tables.c
+++ b/src/mainboard/asus/f2a85-m/irq_tables.c
@@ -15,7 +15,6 @@
 
 #include <arch/pirq_routing.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam15.h>
 #include <device/pci_def.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 09d9455031..31357699ff 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cpu/amd/amdfam15.h>
 #include <cpu/x86/lapic.h>
 #include <device/pci.h>
 #include <stdint.h>
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 943a461e62..73f305a190 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/bap/ode_e20XX/irq_tables.c b/src/mainboard/bap/ode_e20XX/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/bap/ode_e20XX/irq_tables.c
+++ b/src/mainboard/bap/ode_e20XX/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index b2a85fbea2..6073586d9d 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam16.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index d448080637..80a17cc13f 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/bap/ode_e21XX/irq_tables.c b/src/mainboard/bap/ode_e21XX/irq_tables.c
index c48a4452dc..f1dbc087fe 100644
--- a/src/mainboard/bap/ode_e21XX/irq_tables.c
+++ b/src/mainboard/bap/ode_e21XX/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/bap/ode_e21XX/mptable.c b/src/mainboard/bap/ode_e21XX/mptable.c
index 925526c689..8b0ae30764 100644
--- a/src/mainboard/bap/ode_e21XX/mptable.c
+++ b/src/mainboard/bap/ode_e21XX/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index 430aeb363e..47793139a0 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index af38362145..3866f2e230 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam16.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index a9026531fd..478e48fced 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/elmex/pcm205400/irq_tables.c b/src/mainboard/elmex/pcm205400/irq_tables.c
index 0c53417b67..591cabbaa1 100644
--- a/src/mainboard/elmex/pcm205400/irq_tables.c
+++ b/src/mainboard/elmex/pcm205400/irq_tables.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
diff --git a/src/mainboard/elmex/pcm205400/mptable.c b/src/mainboard/elmex/pcm205400/mptable.c
index 8e954cd0d1..4f533a40cb 100644
--- a/src/mainboard/elmex/pcm205400/mptable.c
+++ b/src/mainboard/elmex/pcm205400/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 5992401c82..f937e812a8 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/gizmosphere/gizmo/irq_tables.c b/src/mainboard/gizmosphere/gizmo/irq_tables.c
index 60a8f74d1d..ca30cc7ce3 100644
--- a/src/mainboard/gizmosphere/gizmo/irq_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/irq_tables.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/gizmosphere/gizmo/mptable.c b/src/mainboard/gizmosphere/gizmo/mptable.c
index 497f9556a0..00f0b76477 100644
--- a/src/mainboard/gizmosphere/gizmo/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo/mptable.c
@@ -22,7 +22,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 
 
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 943a461e62..73f305a190 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/gizmosphere/gizmo2/irq_tables.c b/src/mainboard/gizmosphere/gizmo2/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/gizmosphere/gizmo2/irq_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index b2a85fbea2..6073586d9d 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam16.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/google/kahlee/irq_tables.c b/src/mainboard/google/kahlee/irq_tables.c
index e8b906eb0a..bf1daec8a6 100644
--- a/src/mainboard/google/kahlee/irq_tables.c
+++ b/src/mainboard/google/kahlee/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c
index c32955866e..5c07186327 100644
--- a/src/mainboard/google/kahlee/mptable.c
+++ b/src/mainboard/google/kahlee/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <soc/southbridge.h>
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 943a461e62..73f305a190 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/hp/abm/irq_tables.c b/src/mainboard/hp/abm/irq_tables.c
index d7e6385dfb..e18e47842a 100644
--- a/src/mainboard/hp/abm/irq_tables.c
+++ b/src/mainboard/hp/abm/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/hp/abm/mptable.c b/src/mainboard/hp/abm/mptable.c
index 6241282d2c..6869519490 100644
--- a/src/mainboard/hp/abm/mptable.c
+++ b/src/mainboard/hp/abm/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include "southbridge/amd/agesa/hudson/hudson.h"
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index 3beb713805..783bc54a6a 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
-#include <cpu/amd/amdfam15.h>
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c
index 607d28b9c6..761bc04dc4 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam15.h>
 #include <console/console.h>
 #include <device/pci_def.h>
 #include <string.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
index 9e63cafa02..39af326b5f 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam15.h>
 #include <cpu/x86/lapic.h>
 #include <device/pci.h>
 #include <stdint.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index 83daa6eb38..07820969f1 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam14.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <string.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c b/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c
index cfe9250bec..d33b5b8cce 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c
@@ -15,7 +15,6 @@
 
 #include <arch/pirq_routing.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam14.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 5f91c777e0..140b874226 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam14.h>
 #include <device/pci.h>
 #include <drivers/generic/ioapic/chip.h>
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index 3beb713805..783bc54a6a 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
-#include <cpu/amd/amdfam15.h>
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/mainboard/lenovo/g505s/irq_tables.c b/src/mainboard/lenovo/g505s/irq_tables.c
index 607d28b9c6..761bc04dc4 100644
--- a/src/mainboard/lenovo/g505s/irq_tables.c
+++ b/src/mainboard/lenovo/g505s/irq_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam15.h>
 #include <console/console.h>
 #include <device/pci_def.h>
 #include <string.h>
diff --git a/src/mainboard/lenovo/g505s/mptable.c b/src/mainboard/lenovo/g505s/mptable.c
index 9e63cafa02..39af326b5f 100644
--- a/src/mainboard/lenovo/g505s/mptable.c
+++ b/src/mainboard/lenovo/g505s/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam15.h>
 #include <cpu/x86/lapic.h>
 #include <device/pci.h>
 #include <stdint.h>
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index 3f8a4aecd4..2aaa6080fa 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lippert/frontrunner-af/irq_tables.c b/src/mainboard/lippert/frontrunner-af/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/lippert/frontrunner-af/irq_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/lippert/frontrunner-af/mptable.c b/src/mainboard/lippert/frontrunner-af/mptable.c
index 706d625fc4..62195cbad6 100644
--- a/src/mainboard/lippert/frontrunner-af/mptable.c
+++ b/src/mainboard/lippert/frontrunner-af/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 
 u8 intr_data[] = {
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index 3f8a4aecd4..2aaa6080fa 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lippert/toucan-af/irq_tables.c b/src/mainboard/lippert/toucan-af/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/lippert/toucan-af/irq_tables.c
+++ b/src/mainboard/lippert/toucan-af/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/lippert/toucan-af/mptable.c b/src/mainboard/lippert/toucan-af/mptable.c
index 706d625fc4..62195cbad6 100644
--- a/src/mainboard/lippert/toucan-af/mptable.c
+++ b/src/mainboard/lippert/toucan-af/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 
 u8 intr_data[] = {
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index 53ad1bcf00..783bc54a6a 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam15.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <string.h>
diff --git a/src/mainboard/msi/ms7721/irq_tables.c b/src/mainboard/msi/ms7721/irq_tables.c
index 458c15757b..88d2160000 100644
--- a/src/mainboard/msi/ms7721/irq_tables.c
+++ b/src/mainboard/msi/ms7721/irq_tables.c
@@ -15,7 +15,6 @@
 
 #include <arch/pirq_routing.h>
 #include <console/console.h>
-#include <cpu/amd/amdfam15.h>
 #include <device/pci_def.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/msi/ms7721/mptable.c b/src/mainboard/msi/ms7721/mptable.c
index 09d9455031..31357699ff 100644
--- a/src/mainboard/msi/ms7721/mptable.c
+++ b/src/mainboard/msi/ms7721/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cpu/amd/amdfam15.h>
 #include <cpu/x86/lapic.h>
 #include <device/pci.h>
 #include <stdint.h>
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index a9026531fd..478e48fced 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam14.h>
 
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/pcengines/apu1/irq_tables.c b/src/mainboard/pcengines/apu1/irq_tables.c
index 1b6257cee7..9ebe58ae65 100644
--- a/src/mainboard/pcengines/apu1/irq_tables.c
+++ b/src/mainboard/pcengines/apu1/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam14.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/pcengines/apu1/mptable.c b/src/mainboard/pcengines/apu1/mptable.c
index b0de982023..b183d8de24 100644
--- a/src/mainboard/pcengines/apu1/mptable.c
+++ b/src/mainboard/pcengines/apu1/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam14.h>
 #include <SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index d448080637..80a17cc13f 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam16.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/pcengines/apu2/irq_tables.c b/src/mainboard/pcengines/apu2/irq_tables.c
index eaeed3f8cb..f7302baf06 100644
--- a/src/mainboard/pcengines/apu2/irq_tables.c
+++ b/src/mainboard/pcengines/apu2/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam16.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/pcengines/apu2/mptable.c b/src/mainboard/pcengines/apu2/mptable.c
index 896e6373a7..228e2811f2 100644
--- a/src/mainboard/pcengines/apu2/mptable.c
+++ b/src/mainboard/pcengines/apu2/mptable.c
@@ -21,7 +21,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/amd/amdfam15.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/supermicro/h8qgi/acpi_tables.c b/src/mainboard/supermicro/h8qgi/acpi_tables.c
index 3c9ec95632..4221992601 100644
--- a/src/mainboard/supermicro/h8qgi/acpi_tables.c
+++ b/src/mainboard/supermicro/h8qgi/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/supermicro/h8qgi/irq_tables.c b/src/mainboard/supermicro/h8qgi/irq_tables.c
index a94bc15193..52a99e77dd 100644
--- a/src/mainboard/supermicro/h8qgi/irq_tables.c
+++ b/src/mainboard/supermicro/h8qgi/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 7af085d19e..31379a6f56 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/supermicro/h8scm/acpi_tables.c b/src/mainboard/supermicro/h8scm/acpi_tables.c
index 3c9ec95632..4221992601 100644
--- a/src/mainboard/supermicro/h8scm/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/supermicro/h8scm/irq_tables.c b/src/mainboard/supermicro/h8scm/irq_tables.c
index 09d8f861bb..0897945e81 100644
--- a/src/mainboard/supermicro/h8scm/irq_tables.c
+++ b/src/mainboard/supermicro/h8scm/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index 5ef7f3d8c0..417f677955 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s8226/acpi_tables.c b/src/mainboard/tyan/s8226/acpi_tables.c
index 3c9ec95632..4221992601 100644
--- a/src/mainboard/tyan/s8226/acpi_tables.c
+++ b/src/mainboard/tyan/s8226/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/tyan/s8226/irq_tables.c b/src/mainboard/tyan/s8226/irq_tables.c
index a94bc15193..52a99e77dd 100644
--- a/src/mainboard/tyan/s8226/irq_tables.c
+++ b/src/mainboard/tyan/s8226/irq_tables.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c
index 7af085d19e..31379a6f56 100644
--- a/src/mainboard/tyan/s8226/mptable.c
+++ b/src/mainboard/tyan/s8226/mptable.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
-#include <cpu/amd/amdfam10_sysconf.h>
 
 static void *smp_write_config_table(void *v)
 {