summaryrefslogtreecommitdiff
path: root/src/mainboard/amd
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2017-09-18 12:10:21 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2017-09-19 18:38:58 +0000
commitd082b6ae848a91628b210ed7ff9fcc829cfa74f5 (patch)
tree8c0b402e9c7473983e4584ba4e91dfefab29d503 /src/mainboard/amd
parentc924f3982968ff099db49949b8b60963008e3d37 (diff)
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>
Diffstat (limited to 'src/mainboard/amd')
-rw-r--r--src/mainboard/amd/bettong/acpi_tables.c1
-rw-r--r--src/mainboard/amd/bettong/irq_tables.c1
-rw-r--r--src/mainboard/amd/bettong/mptable.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/acpi_tables.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/irq_tables.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/mptable.c1
-rw-r--r--src/mainboard/amd/dinar/acpi_tables.c1
-rw-r--r--src/mainboard/amd/dinar/irq_tables.c1
-rw-r--r--src/mainboard/amd/dinar/mptable.c1
-rw-r--r--src/mainboard/amd/gardenia/irq_tables.c1
-rw-r--r--src/mainboard/amd/gardenia/mptable.c1
-rw-r--r--src/mainboard/amd/inagua/acpi_tables.c1
-rw-r--r--src/mainboard/amd/inagua/irq_tables.c1
-rw-r--r--src/mainboard/amd/inagua/mptable.c1
-rw-r--r--src/mainboard/amd/lamar/acpi_tables.c1
-rw-r--r--src/mainboard/amd/lamar/irq_tables.c1
-rw-r--r--src/mainboard/amd/lamar/mptable.c1
-rw-r--r--src/mainboard/amd/olivehill/acpi_tables.c1
-rw-r--r--src/mainboard/amd/olivehill/irq_tables.c1
-rw-r--r--src/mainboard/amd/olivehill/mptable.c1
-rw-r--r--src/mainboard/amd/olivehillplus/acpi_tables.c1
-rw-r--r--src/mainboard/amd/olivehillplus/irq_tables.c1
-rw-r--r--src/mainboard/amd/olivehillplus/mptable.c1
-rw-r--r--src/mainboard/amd/parmer/acpi_tables.c1
-rw-r--r--src/mainboard/amd/parmer/irq_tables.c1
-rw-r--r--src/mainboard/amd/parmer/mptable.c1
-rw-r--r--src/mainboard/amd/persimmon/acpi_tables.c1
-rw-r--r--src/mainboard/amd/persimmon/irq_tables.c1
-rw-r--r--src/mainboard/amd/persimmon/mptable.c1
-rw-r--r--src/mainboard/amd/south_station/acpi_tables.c1
-rw-r--r--src/mainboard/amd/south_station/irq_tables.c1
-rw-r--r--src/mainboard/amd/south_station/mptable.c1
-rw-r--r--src/mainboard/amd/thatcher/acpi_tables.c1
-rw-r--r--src/mainboard/amd/thatcher/irq_tables.c1
-rw-r--r--src/mainboard/amd/thatcher/mptable.c1
-rw-r--r--src/mainboard/amd/torpedo/acpi_tables.c1
-rw-r--r--src/mainboard/amd/torpedo/irq_tables.c1
-rw-r--r--src/mainboard/amd/torpedo/mptable.c1
-rw-r--r--src/mainboard/amd/union_station/acpi_tables.c1
-rw-r--r--src/mainboard/amd/union_station/irq_tables.c1
-rw-r--r--src/mainboard/amd/union_station/mptable.c1
41 files changed, 0 insertions, 41 deletions
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>