summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
authorstepan <stepan@coresystems.de>2010-12-08 07:07:33 +0000
committerStefan Reinauer <stepan@openbios.org>2010-12-08 07:07:33 +0000
commit8301d8348a0848d56fdf4dbd76acd6bdcd3fc944 (patch)
treefc0064592143c4cef40319c36fa907b72e071d81 /src/northbridge
parent836ae29ee325b1e3d28ff59468cc50913b1e24ce (diff)
downloadcoreboot-8301d8348a0848d56fdf4dbd76acd6bdcd3fc944.tar.xz
second round name simplification. drop the <component>_ prefix.
the prefix was introduced in the early v2 tree many years ago because our old build system "newconfig" could not handle two files with the same name in different paths like /path/to/usb.c and /another/path/to/usb.c correctly. Only one of the files would end up being compiled into the final image. Since Kconfig (actually since shortly before we switched to Kconfig) we don't suffer from that problem anymore. So we could drop the sb700_ prefix from all those filenames (or, the <componentname>_ prefix in general) - makes it easier to fork off a new chipset - makes it easier to diff against other chipsets - storing redundant information in filenames seems wrong Signed-off-by: <stepan@coresystems.de> Acked-by: Patrick Georgi <patrick@georgi-clan.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6150 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/amd/amdfam10/Makefile.inc2
-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.h2
-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.c2
-rw-r--r--src/northbridge/amd/amdfam10/northbridge.c2
-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.inc2
-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.h4
-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.c4
-rw-r--r--src/northbridge/amd/amdk8/util.asl (renamed from src/northbridge/amd/amdk8/amdk8_util.asl)0
-rw-r--r--src/northbridge/intel/i82830/Makefile.inc2
-rw-r--r--src/northbridge/intel/i82830/smihandler.c (renamed from src/northbridge/intel/i82830/i82830_smihandler.c)0
-rw-r--r--src/northbridge/via/cx700/Makefile.inc10
-rw-r--r--src/northbridge/via/cx700/agp.c (renamed from src/northbridge/via/cx700/cx700_agp.c)0
-rw-r--r--src/northbridge/via/cx700/early_serial.c (renamed from src/northbridge/via/cx700/cx700_early_serial.c)0
-rw-r--r--src/northbridge/via/cx700/early_smbus.c (renamed from src/northbridge/via/cx700/cx700_early_smbus.c)0
-rw-r--r--src/northbridge/via/cx700/lpc.c (renamed from src/northbridge/via/cx700/cx700_lpc.c)0
-rw-r--r--src/northbridge/via/cx700/raminit.c2
-rw-r--r--src/northbridge/via/cx700/registers.h (renamed from src/northbridge/via/cx700/cx700_registers.h)0
-rw-r--r--src/northbridge/via/cx700/reset.c (renamed from src/northbridge/via/cx700/cx700_reset.c)0
-rw-r--r--src/northbridge/via/cx700/sata.c (renamed from src/northbridge/via/cx700/cx700_sata.c)0
-rw-r--r--src/northbridge/via/cx700/usb.c (renamed from src/northbridge/via/cx700/cx700_usb.c)0
-rw-r--r--src/northbridge/via/cx700/vga.c (renamed from src/northbridge/via/cx700/cx700_vga.c)2
-rw-r--r--src/northbridge/via/vx800/Makefile.inc4
-rw-r--r--src/northbridge/via/vx800/early_serial.c (renamed from src/northbridge/via/vx800/vx800_early_serial.c)0
-rw-r--r--src/northbridge/via/vx800/early_smbus.c (renamed from src/northbridge/via/vx800/vx800_early_smbus.c)0
-rw-r--r--src/northbridge/via/vx800/ide.c (renamed from src/northbridge/via/vx800/vx800_ide.c)0
-rw-r--r--src/northbridge/via/vx800/lpc.c (renamed from src/northbridge/via/vx800/vx800_lpc.c)0
-rw-r--r--src/northbridge/via/vx800/raminit.c4
36 files changed, 22 insertions, 22 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
diff --git a/src/northbridge/intel/i82830/Makefile.inc b/src/northbridge/intel/i82830/Makefile.inc
index e3a990aa44..c8cf0f4215 100644
--- a/src/northbridge/intel/i82830/Makefile.inc
+++ b/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,4 @@
driver-y += northbridge.c
driver-y += vga.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/northbridge/intel/i82830/i82830_smihandler.c b/src/northbridge/intel/i82830/smihandler.c
index 852c764608..852c764608 100644
--- a/src/northbridge/intel/i82830/i82830_smihandler.c
+++ b/src/northbridge/intel/i82830/smihandler.c
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index f67cc147a2..b833013790 100644
--- a/src/northbridge/via/cx700/Makefile.inc
+++ b/src/northbridge/via/cx700/Makefile.inc
@@ -17,10 +17,10 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-ramstage-y += cx700_reset.c
+ramstage-y += reset.c
ramstage-y += northbridge.c
-driver-y += cx700_agp.c
-driver-y += cx700_lpc.c
-driver-y += cx700_sata.c
-driver-y += cx700_vga.c
+driver-y += agp.c
+driver-y += lpc.c
+driver-y += sata.c
+driver-y += vga.c
diff --git a/src/northbridge/via/cx700/cx700_agp.c b/src/northbridge/via/cx700/agp.c
index 0166ee135a..0166ee135a 100644
--- a/src/northbridge/via/cx700/cx700_agp.c
+++ b/src/northbridge/via/cx700/agp.c
diff --git a/src/northbridge/via/cx700/cx700_early_serial.c b/src/northbridge/via/cx700/early_serial.c
index 3f5020f670..3f5020f670 100644
--- a/src/northbridge/via/cx700/cx700_early_serial.c
+++ b/src/northbridge/via/cx700/early_serial.c
diff --git a/src/northbridge/via/cx700/cx700_early_smbus.c b/src/northbridge/via/cx700/early_smbus.c
index 4766e59a29..4766e59a29 100644
--- a/src/northbridge/via/cx700/cx700_early_smbus.c
+++ b/src/northbridge/via/cx700/early_smbus.c
diff --git a/src/northbridge/via/cx700/cx700_lpc.c b/src/northbridge/via/cx700/lpc.c
index 77ab97c145..77ab97c145 100644
--- a/src/northbridge/via/cx700/cx700_lpc.c
+++ b/src/northbridge/via/cx700/lpc.c
diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c
index 5694ea31aa..d455768d96 100644
--- a/src/northbridge/via/cx700/raminit.c
+++ b/src/northbridge/via/cx700/raminit.c
@@ -21,7 +21,7 @@
#include <spd.h>
#include <spd_ddr2.h>
#include <delay.h>
-#include "cx700_registers.h"
+#include "registers.h"
/* Debugging macros. */
#if CONFIG_DEBUG_RAM_SETUP
diff --git a/src/northbridge/via/cx700/cx700_registers.h b/src/northbridge/via/cx700/registers.h
index b63984f67f..b63984f67f 100644
--- a/src/northbridge/via/cx700/cx700_registers.h
+++ b/src/northbridge/via/cx700/registers.h
diff --git a/src/northbridge/via/cx700/cx700_reset.c b/src/northbridge/via/cx700/reset.c
index 83439881f6..83439881f6 100644
--- a/src/northbridge/via/cx700/cx700_reset.c
+++ b/src/northbridge/via/cx700/reset.c
diff --git a/src/northbridge/via/cx700/cx700_sata.c b/src/northbridge/via/cx700/sata.c
index 993b05ad0a..993b05ad0a 100644
--- a/src/northbridge/via/cx700/cx700_sata.c
+++ b/src/northbridge/via/cx700/sata.c
diff --git a/src/northbridge/via/cx700/cx700_usb.c b/src/northbridge/via/cx700/usb.c
index a85189477f..a85189477f 100644
--- a/src/northbridge/via/cx700/cx700_usb.c
+++ b/src/northbridge/via/cx700/usb.c
diff --git a/src/northbridge/via/cx700/cx700_vga.c b/src/northbridge/via/cx700/vga.c
index 8fd94c71ef..91dd8649e9 100644
--- a/src/northbridge/via/cx700/cx700_vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -30,7 +30,7 @@
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h>
#include <arch/interrupt.h>
-#include "cx700_registers.h"
+#include "registers.h"
#include "chip.h"
#include "northbridge.h"
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index de6c491ebe..670a3e9550 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -20,8 +20,8 @@
driver-y += northbridge.c
driver-y += vga.c
-driver-y += vx800_lpc.c
-driver-y += vx800_ide.c
+driver-y += lpc.c
+driver-y += ide.c
chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc
chipset_bootblock_lds += $(src)/northbridge/via/vx800/romstrap.lds
diff --git a/src/northbridge/via/vx800/vx800_early_serial.c b/src/northbridge/via/vx800/early_serial.c
index f46341ff15..f46341ff15 100644
--- a/src/northbridge/via/vx800/vx800_early_serial.c
+++ b/src/northbridge/via/vx800/early_serial.c
diff --git a/src/northbridge/via/vx800/vx800_early_smbus.c b/src/northbridge/via/vx800/early_smbus.c
index 421716cb6c..421716cb6c 100644
--- a/src/northbridge/via/vx800/vx800_early_smbus.c
+++ b/src/northbridge/via/vx800/early_smbus.c
diff --git a/src/northbridge/via/vx800/vx800_ide.c b/src/northbridge/via/vx800/ide.c
index 9fa8f35dbe..9fa8f35dbe 100644
--- a/src/northbridge/via/vx800/vx800_ide.c
+++ b/src/northbridge/via/vx800/ide.c
diff --git a/src/northbridge/via/vx800/vx800_lpc.c b/src/northbridge/via/vx800/lpc.c
index b9941d1270..b9941d1270 100644
--- a/src/northbridge/via/vx800/vx800_lpc.c
+++ b/src/northbridge/via/vx800/lpc.c
diff --git a/src/northbridge/via/vx800/raminit.c b/src/northbridge/via/vx800/raminit.c
index ce9b7d4fab..f039b025ff 100644
--- a/src/northbridge/via/vx800/raminit.c
+++ b/src/northbridge/via/vx800/raminit.c
@@ -35,8 +35,8 @@
#endif
#include "northbridge/via/vx800/translator_ddr2_init.c"
#include "northbridge/via/vx800/dram_init.h"
-#include "northbridge/via/vx800/vx800_early_smbus.c"
-#include "northbridge/via/vx800/vx800_early_serial.c"
+#include "northbridge/via/vx800/early_smbus.c"
+#include "northbridge/via/vx800/early_serial.c"
#include "northbridge/via/vx800/dram_util.h"
#include "northbridge/via/vx800/dram_util.c"
#include "northbridge/via/vx800/detection.c"