Rename build system variables to be more intuitive, and

at the same time let the user specify sources instead
of object files:
- objs becomes ramstage-srcs
- initobjs becomes romstage-srcs
- driver becomes driver-srcs
- smmobj becomes smm-srcs

The user servicable parts are named accordingly:
ramstage-y, romstage-y, driver-y, smm-y

Also, the object file names are properly renamed now, using
.ramstage.o, .romstage.o, .driver.o, .smm.o suffixes consistently.

Remove stubbed out via/epia-m700 dsdt/ssdt files - they didn't
easily fit in the build system and aren't useful anyway.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coreystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5886 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

21 files changed, 67 insertions, 67 deletions

diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index 91f488d50a..05e66d6f2d 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -1,16 +1,16 @@
-driver-y += northbridge.o
-driver-y += misc_control.o
+driver-y += northbridge.c
+driver-y += misc_control.c
 
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.o
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.asl
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.asl
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.asl
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.asl
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.asl
 
-obj-y += get_pci1234.o
+ramstage-y += get_pci1234.c
 
 # Enable this if you want to check the values of the PCI routing registers.
 # Call show_all_routes() anywhere amdfam10.h is included.
-#obj-y += util.o
+#ramstage-y += util.c
diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc
index 1a8631ddb9..f5c4d19fbb 100644
--- a/src/northbridge/amd/amdk8/Makefile.inc
+++ b/src/northbridge/amd/amdk8/Makefile.inc
@@ -1,11 +1,11 @@
-driver-y += northbridge.o
-driver-y += misc_control.o
-obj-y += get_sblk_pci1234.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_acpi.o
+driver-y += northbridge.c
+driver-y += misc_control.c
+ramstage-y += get_sblk_pci1234.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_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.
-#obj-y += util.o
+#ramstage-y += util.c
 
 # Not sure what to do with these yet. How did raminit_test even work?
 # Should be a target in -y form.
diff --git a/src/northbridge/amd/gx1/Makefile.inc b/src/northbridge/amd/gx1/Makefile.inc
index c6b480940f..16d702a24e 100644
--- a/src/northbridge/amd/gx1/Makefile.inc
+++ b/src/northbridge/amd/gx1/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
+driver-y += northbridge.c
 
diff --git a/src/northbridge/amd/gx2/Makefile.inc b/src/northbridge/amd/gx2/Makefile.inc
index f86105fd2e..482aff92aa 100644
--- a/src/northbridge/amd/gx2/Makefile.inc
+++ b/src/northbridge/amd/gx2/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += northbridge.o
-obj-y += northbridgeinit.o
-obj-y += grphinit.o
+driver-y += northbridge.c
+ramstage-y += northbridgeinit.c
+ramstage-y += grphinit.c
diff --git a/src/northbridge/amd/lx/Makefile.inc b/src/northbridge/amd/lx/Makefile.inc
index f86105fd2e..482aff92aa 100644
--- a/src/northbridge/amd/lx/Makefile.inc
+++ b/src/northbridge/amd/lx/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += northbridge.o
-obj-y += northbridgeinit.o
-obj-y += grphinit.o
+driver-y += northbridge.c
+ramstage-y += northbridgeinit.c
+ramstage-y += grphinit.c
diff --git a/src/northbridge/intel/e7501/Makefile.inc b/src/northbridge/intel/e7501/Makefile.inc
index ea44b26cbe..23eada5ad3 100644
--- a/src/northbridge/intel/e7501/Makefile.inc
+++ b/src/northbridge/intel/e7501/Makefile.inc
@@ -1 +1 @@
-obj-y += northbridge.o
+ramstage-y += northbridge.c
diff --git a/src/northbridge/intel/e7520/Makefile.inc b/src/northbridge/intel/e7520/Makefile.inc
index a23c31de89..32c68365e8 100644
--- a/src/northbridge/intel/e7520/Makefile.inc
+++ b/src/northbridge/intel/e7520/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += northbridge.o
-driver-y += pciexp_porta.o
-driver-y += pciexp_porta1.o
-driver-y += pciexp_portb.o
-driver-y += pciexp_portc.o
+driver-y += northbridge.c
+driver-y += pciexp_porta.c
+driver-y += pciexp_porta1.c
+driver-y += pciexp_portb.c
+driver-y += pciexp_portc.c
diff --git a/src/northbridge/intel/e7525/Makefile.inc b/src/northbridge/intel/e7525/Makefile.inc
index a23c31de89..32c68365e8 100644
--- a/src/northbridge/intel/e7525/Makefile.inc
+++ b/src/northbridge/intel/e7525/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += northbridge.o
-driver-y += pciexp_porta.o
-driver-y += pciexp_porta1.o
-driver-y += pciexp_portb.o
-driver-y += pciexp_portc.o
+driver-y += northbridge.c
+driver-y += pciexp_porta.c
+driver-y += pciexp_porta1.c
+driver-y += pciexp_portb.c
+driver-y += pciexp_portc.c
diff --git a/src/northbridge/intel/i3100/Makefile.inc b/src/northbridge/intel/i3100/Makefile.inc
index c776b058f8..c2de0fcb58 100644
--- a/src/northbridge/intel/i3100/Makefile.inc
+++ b/src/northbridge/intel/i3100/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += northbridge.o
-driver-y += pciexp_porta.o
-driver-y += pciexp_porta_ep80579.o
+driver-y += northbridge.c
+driver-y += pciexp_porta.c
+driver-y += pciexp_porta_ep80579.c
diff --git a/src/northbridge/intel/i440bx/Makefile.inc b/src/northbridge/intel/i440bx/Makefile.inc
index c6b480940f..16d702a24e 100644
--- a/src/northbridge/intel/i440bx/Makefile.inc
+++ b/src/northbridge/intel/i440bx/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
+driver-y += northbridge.c
 
diff --git a/src/northbridge/intel/i440lx/Makefile.inc b/src/northbridge/intel/i440lx/Makefile.inc
index c6b480940f..16d702a24e 100644
--- a/src/northbridge/intel/i440lx/Makefile.inc
+++ b/src/northbridge/intel/i440lx/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
+driver-y += northbridge.c
 
diff --git a/src/northbridge/intel/i82810/Makefile.inc b/src/northbridge/intel/i82810/Makefile.inc
index c6b480940f..16d702a24e 100644
--- a/src/northbridge/intel/i82810/Makefile.inc
+++ b/src/northbridge/intel/i82810/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
+driver-y += northbridge.c
 
diff --git a/src/northbridge/intel/i82830/Makefile.inc b/src/northbridge/intel/i82830/Makefile.inc
index 57dedfde73..e3a990aa44 100644
--- a/src/northbridge/intel/i82830/Makefile.inc
+++ b/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,4 @@
-driver-y += northbridge.o
-driver-y += vga.o
+driver-y += northbridge.c
+driver-y += vga.c
 
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.c
diff --git a/src/northbridge/intel/i855/Makefile.inc b/src/northbridge/intel/i855/Makefile.inc
index ea44b26cbe..23eada5ad3 100644
--- a/src/northbridge/intel/i855/Makefile.inc
+++ b/src/northbridge/intel/i855/Makefile.inc
@@ -1 +1 @@
-obj-y += northbridge.o
+ramstage-y += northbridge.c
diff --git a/src/northbridge/intel/i945/Makefile.inc b/src/northbridge/intel/i945/Makefile.inc
index 5447e4406f..57362c6c47 100644
--- a/src/northbridge/intel/i945/Makefile.inc
+++ b/src/northbridge/intel/i945/Makefile.inc
@@ -17,6 +17,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-driver-y += northbridge.o
-driver-y += gma.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o
+driver-y += northbridge.c
+driver-y += gma.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
diff --git a/src/northbridge/via/cn400/Makefile.inc b/src/northbridge/via/cn400/Makefile.inc
index 89bff39862..64eab38739 100644
--- a/src/northbridge/via/cn400/Makefile.inc
+++ b/src/northbridge/via/cn400/Makefile.inc
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
-driver-y += agp.o
-driver-y += vga.o
-driver-y += vlink.o
+driver-y += northbridge.c
+driver-y += agp.c
+driver-y += vga.c
+driver-y += vlink.c
 
diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc
index c0aa7b9e43..1654111d8e 100644
--- a/src/northbridge/via/cn700/Makefile.inc
+++ b/src/northbridge/via/cn700/Makefile.inc
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
-driver-y += agp.o
-driver-y += vga.o
+driver-y += northbridge.c
+driver-y += agp.c
+driver-y += vga.c
 
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index 1221fd5f8b..f67cc147a2 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
 ##
 
-obj-y += cx700_reset.o
-obj-y += northbridge.o
+ramstage-y += cx700_reset.c
+ramstage-y += northbridge.c
 
-driver-y += cx700_agp.o
-driver-y += cx700_lpc.o
-driver-y += cx700_sata.o
-driver-y += cx700_vga.o
+driver-y += cx700_agp.c
+driver-y += cx700_lpc.c
+driver-y += cx700_sata.c
+driver-y += cx700_vga.c
diff --git a/src/northbridge/via/vt8601/Makefile.inc b/src/northbridge/via/vt8601/Makefile.inc
index c9dc918ecc..126fe910b4 100644
--- a/src/northbridge/via/vt8601/Makefile.inc
+++ b/src/northbridge/via/vt8601/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
+driver-y += northbridge.c
 
diff --git a/src/northbridge/via/vt8623/Makefile.inc b/src/northbridge/via/vt8623/Makefile.inc
index 47682ad13d..7f6f77d328 100644
--- a/src/northbridge/via/vt8623/Makefile.inc
+++ b/src/northbridge/via/vt8623/Makefile.inc
@@ -18,6 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
-driver-y += vga.o
+driver-y += northbridge.c
+driver-y += vga.c
 
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index c44266d0c3..de6c491ebe 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -18,10 +18,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += northbridge.o
-driver-y += vga.o
-driver-y += vx800_lpc.o
-driver-y += vx800_ide.o
+driver-y += northbridge.c
+driver-y += vga.c
+driver-y += vx800_lpc.c
+driver-y += vx800_ide.c
 
 chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc
 chipset_bootblock_lds += $(src)/northbridge/via/vx800/romstrap.lds