diff options
Diffstat (limited to 'src/northbridge/amd')
-rw-r--r-- | src/northbridge/amd/amdfam10/Makefile.inc | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/acpi.c (renamed from src/northbridge/amd/amdfam10/amdfam10_acpi.c) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/amdfam10.h | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/conf.c (renamed from src/northbridge/amd/amdfam10/amdfam10_conf.c) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/debug.c | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/northbridge.c | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/nums.h (renamed from src/northbridge/amd/amdfam10/amdfam10_nums.h) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdfam10/pci.c (renamed from src/northbridge/amd/amdfam10/amdfam10_pci.c) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/Makefile.inc | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/acpi.c (renamed from src/northbridge/amd/amdk8/amdk8_acpi.c) | 2 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/acpi.h (renamed from src/northbridge/amd/amdk8/amdk8_acpi.h) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/amdk8.h | 4 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/f.h (renamed from src/northbridge/amd/amdk8/amdk8_f.h) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/f_pci.c (renamed from src/northbridge/amd/amdk8/amdk8_f_pci.c) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/pre_f.h (renamed from src/northbridge/amd/amdk8/amdk8_pre_f.h) | 0 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/raminit_f.c | 4 | ||||
-rw-r--r-- | src/northbridge/amd/amdk8/util.asl (renamed from src/northbridge/amd/amdk8/amdk8_util.asl) | 0 |
17 files changed, 10 insertions, 10 deletions
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc index 05e66d6f2d..2ab9c0fb16 100644 --- a/src/northbridge/amd/amdfam10/Makefile.inc +++ b/src/northbridge/amd/amdfam10/Makefile.inc @@ -1,7 +1,7 @@ driver-y += northbridge.c driver-y += misc_control.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.asl ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.asl diff --git a/src/northbridge/amd/amdfam10/amdfam10_acpi.c b/src/northbridge/amd/amdfam10/acpi.c index 7e57cce0ab..7e57cce0ab 100644 --- a/src/northbridge/amd/amdfam10/amdfam10_acpi.c +++ b/src/northbridge/amd/amdfam10/acpi.c diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h index b1eaecd049..0f9295e8bb 100644 --- a/src/northbridge/amd/amdfam10/amdfam10.h +++ b/src/northbridge/amd/amdfam10/amdfam10.h @@ -964,7 +964,7 @@ that are corresponding to 0x01, 0x02, 0x03, 0x05, 0x06, 0x07 #define F10_APSTATE_STOPPED 0x14 // allow AP to stop #define F10_APSTATE_RESET 0x01 // waiting for warm reset -#include "amdfam10_nums.h" +#include "nums.h" #ifdef __PRE_RAM__ #if NODE_NUMS==64 diff --git a/src/northbridge/amd/amdfam10/amdfam10_conf.c b/src/northbridge/amd/amdfam10/conf.c index adfff0f6e3..adfff0f6e3 100644 --- a/src/northbridge/amd/amdfam10/amdfam10_conf.c +++ b/src/northbridge/amd/amdfam10/conf.c diff --git a/src/northbridge/amd/amdfam10/debug.c b/src/northbridge/amd/amdfam10/debug.c index df4c079bbe..2dc54275fd 100644 --- a/src/northbridge/amd/amdfam10/debug.c +++ b/src/northbridge/amd/amdfam10/debug.c @@ -21,7 +21,7 @@ * Generic FAM10 debug code, used by mainboard specific romstage.c */ -#include "amdfam10_pci.c" +#include "pci.c" #include <delay.h> static inline void print_debug_addr(const char *str, void *val) diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index d317b51148..b3e99ec441 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -124,7 +124,7 @@ static u32 amdfam10_nodeid(device_t dev) #endif } -#include "amdfam10_conf.c" +#include "conf.c" static void set_vga_enable_reg(u32 nodeid, u32 linkn) { diff --git a/src/northbridge/amd/amdfam10/amdfam10_nums.h b/src/northbridge/amd/amdfam10/nums.h index ba3666659c..ba3666659c 100644 --- a/src/northbridge/amd/amdfam10/amdfam10_nums.h +++ b/src/northbridge/amd/amdfam10/nums.h diff --git a/src/northbridge/amd/amdfam10/amdfam10_pci.c b/src/northbridge/amd/amdfam10/pci.c index d08a9718c7..d08a9718c7 100644 --- a/src/northbridge/amd/amdfam10/amdfam10_pci.c +++ b/src/northbridge/amd/amdfam10/pci.c diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc index f5c4d19fbb..e35b9ed2d0 100644 --- a/src/northbridge/amd/amdk8/Makefile.inc +++ b/src/northbridge/amd/amdk8/Makefile.inc @@ -1,7 +1,7 @@ driver-y += northbridge.c driver-y += misc_control.c ramstage-y += get_sblk_pci1234.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_acpi.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c # Enable this if you want to check the values of the PCI routing registers. # Call show_all_routes() anywhere amdk8.h is included. diff --git a/src/northbridge/amd/amdk8/amdk8_acpi.c b/src/northbridge/amd/amdk8/acpi.c index c3f0f07d23..7a5d1c276e 100644 --- a/src/northbridge/amd/amdk8/amdk8_acpi.c +++ b/src/northbridge/amd/amdk8/acpi.c @@ -31,7 +31,7 @@ #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> -#include "amdk8_acpi.h" +#include "acpi.h" //it seems some functions can be moved arch/i386/boot/acpi.c diff --git a/src/northbridge/amd/amdk8/amdk8_acpi.h b/src/northbridge/amd/amdk8/acpi.h index 7fb27d1acc..7fb27d1acc 100644 --- a/src/northbridge/amd/amdk8/amdk8_acpi.h +++ b/src/northbridge/amd/amdk8/acpi.h diff --git a/src/northbridge/amd/amdk8/amdk8.h b/src/northbridge/amd/amdk8/amdk8.h index dc7ef1bcab..e353edc479 100644 --- a/src/northbridge/amd/amdk8/amdk8.h +++ b/src/northbridge/amd/amdk8/amdk8.h @@ -3,9 +3,9 @@ #define AMDK8_H #if CONFIG_K8_REV_F_SUPPORT == 1 - #include "amdk8_f.h" + #include "f.h" #else - #include "amdk8_pre_f.h" + #include "pre_f.h" #endif #ifdef __PRE_RAM__ diff --git a/src/northbridge/amd/amdk8/amdk8_f.h b/src/northbridge/amd/amdk8/f.h index 769f5980ba..769f5980ba 100644 --- a/src/northbridge/amd/amdk8/amdk8_f.h +++ b/src/northbridge/amd/amdk8/f.h diff --git a/src/northbridge/amd/amdk8/amdk8_f_pci.c b/src/northbridge/amd/amdk8/f_pci.c index d89dadc0d6..d89dadc0d6 100644 --- a/src/northbridge/amd/amdk8/amdk8_f_pci.c +++ b/src/northbridge/amd/amdk8/f_pci.c diff --git a/src/northbridge/amd/amdk8/amdk8_pre_f.h b/src/northbridge/amd/amdk8/pre_f.h index dae2d97cd3..dae2d97cd3 100644 --- a/src/northbridge/amd/amdk8/amdk8_pre_f.h +++ b/src/northbridge/amd/amdk8/pre_f.h diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c index fac30a849b..3135bcedb9 100644 --- a/src/northbridge/amd/amdk8/raminit_f.c +++ b/src/northbridge/amd/amdk8/raminit_f.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include "raminit.h" -#include "amdk8_f.h" +#include "f.h" #include <spd_ddr2.h> #if CONFIG_HAVE_OPTION_TABLE #include "option_table.h" @@ -43,7 +43,7 @@ # error "CONFIG_RAMTOP must be a power of 2" #endif -#include "amdk8_f_pci.c" +#include "f_pci.c" /* for PCI_ADDR(0, 0x18, 2, 0x98) index, diff --git a/src/northbridge/amd/amdk8/amdk8_util.asl b/src/northbridge/amd/amdk8/util.asl index 57a2cf95c8..57a2cf95c8 100644 --- a/src/northbridge/amd/amdk8/amdk8_util.asl +++ b/src/northbridge/amd/amdk8/util.asl |