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

src/cpu/amd/dualcore/Makefile.inc

@@ -1,2 +1,2 @@
 # This is a leaf Makefile, no conditionals. If it is included it will be used.
-obj-y += amd_sibling.o
+ramstage-y += amd_sibling.c

src/cpu/amd/microcode/Makefile.inc

@@ -1 +1 @@
-obj-y += microcode.o
+ramstage-y += microcode.c

src/cpu/amd/model_10xxx/Makefile.inc

@@ -1,5 +1,5 @@
 # no conditionals here. If you include this file from a socket, then you get all the binaries.
-driver-y += model_10xxx_init.o
-obj-y += update_microcode.o
-obj-y += apic_timer.o
-obj-y += processor_name.o
+driver-y += model_10xxx_init.c
+ramstage-y += update_microcode.c
+ramstage-y += apic_timer.c
+ramstage-y += processor_name.c

src/cpu/amd/model_fxx/Makefile.inc

@@ -1,6 +1,6 @@
 # no conditionals here. If you include this file from a socket, then you get all the binaries.
-driver-y += model_fxx_init.o
-obj-y += apic_timer.o
-obj-y += model_fxx_update_microcode.o
-obj-y += processor_name.o
-obj-y += powernow_acpi.o
+driver-y += model_fxx_init.c
+ramstage-y += apic_timer.c
+ramstage-y += model_fxx_update_microcode.c
+ramstage-y += processor_name.c
+ramstage-y += powernow_acpi.c

src/cpu/amd/model_gx1/Makefile.inc

@@ -22,7 +22,7 @@ subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
-driver-y += model_gx1_init.o
+driver-y += model_gx1_init.c
 
 cpu_incs += $(src)/cpu/amd/model_gx1/cpu_setup.inc
 cpu_incs += $(src)/cpu/amd/model_gx1/gx_setup.inc

src/cpu/amd/model_gx2/Makefile.inc

@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
-driver-y += model_gx2_init.o
-obj-y += cpubug.o
+driver-y += model_gx2_init.c
+ramstage-y += cpubug.c
 
 cpu_incs += $(src)/cpu/amd/model_gx2/cache_as_ram.inc

src/cpu/amd/model_lx/Makefile.inc

@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
-driver-y += model_lx_init.o
-obj-y += cpubug.o
+driver-y += model_lx_init.c
+ramstage-y += cpubug.c
 
 cpu_incs += $(src)/cpu/amd/model_lx/cache_as_ram.inc

src/cpu/amd/mtrr/Makefile.inc

@@ -1 +1 @@
-obj-y += amd_mtrr.o
+ramstage-y += amd_mtrr.c

src/cpu/amd/quadcore/Makefile.inc

@@ -1 +1 @@
-obj-y += amd_sibling.o
+ramstage-y += amd_sibling.c

src/cpu/amd/sc520/Makefile.inc

@@ -1 +1 @@
-obj-y += sc520.o
+ramstage-y += sc520.c

src/cpu/amd/socket_754/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_754.o
+ramstage-y += socket_754.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_939/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_939.o
+ramstage-y += socket_939.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_940/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_940.o
+ramstage-y += socket_940.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_AM2/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_AM2.o
+ramstage-y += socket_AM2.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_AM2r2/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_AM2r2.o
+ramstage-y += socket_AM2r2.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_AM3/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_AM3.o
+ramstage-y += socket_AM3.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_ASB2/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_ASB2.o
+ramstage-y += socket_ASB2.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_F/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_F.o
+ramstage-y += socket_F.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_F_1207/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_F_1207.o
+ramstage-y += socket_F_1207.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_S1G1/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_S1G1.o
+ramstage-y += socket_S1G1.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/intel/bga956/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += bga956.o
+ramstage-y += bga956.c
 subdirs-y += ../model_1067x
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/ep80579/Makefile.inc

@@ -1,5 +1,5 @@
-obj-y += ep80579.o
-driver-y += ep80579_init.o
+ramstage-y += ep80579.c
+driver-y += ep80579_init.c
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr
 subdirs-y += ../../x86/lapic

src/cpu/intel/hyperthreading/Makefile.inc

@@ -1 +1 @@
-obj-y += intel_sibling.o
+ramstage-y += intel_sibling.c

src/cpu/intel/microcode/Makefile.inc

@@ -1 +1 @@
-obj-y += microcode.o
+ramstage-y += microcode.c

src/cpu/intel/model_1067x/Makefile.inc

@@ -1,3 +1,3 @@
-driver-y += model_1067x_init.o
+driver-y += model_1067x_init.c
 subdirs-y += ../../x86/name
 

src/cpu/intel/model_106cx/Makefile.inc

@@ -1,4 +1,4 @@
-driver-y += model_106cx_init.o
+driver-y += model_106cx_init.c
 subdirs-y += ../../x86/name
 
 cpu_incs += $(src)/cpu/intel/model_106cx/cache_as_ram.inc

src/cpu/intel/model_68x/Makefile.inc

@@ -18,6 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += model_68x_init.o
+driver-y += model_68x_init.c
 subdirs-y += ../../x86/name
 

src/cpu/intel/model_69x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_69x_init.o
+driver-y += model_69x_init.c

src/cpu/intel/model_6bx/Makefile.inc

@@ -1,2 +1,2 @@
-driver-y += model_6bx_init.o
+driver-y += model_6bx_init.c
 subdirs-y += ../../x86/name

src/cpu/intel/model_6dx/Makefile.inc

@@ -1 +1 @@
-driver-y += model_6dx_init.o
+driver-y += model_6dx_init.c

src/cpu/intel/model_6ex/Makefile.inc

@@ -1,4 +1,4 @@
-driver-y += model_6ex_init.o
+driver-y += model_6ex_init.c
 subdirs-y += ../../x86/name
 
 cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc

src/cpu/intel/model_6fx/Makefile.inc

@@ -1,2 +1,2 @@
-driver-y += model_6fx_init.o
+driver-y += model_6fx_init.c
 subdirs-y += ../../x86/name

src/cpu/intel/model_6xx/Makefile.inc

@@ -1 +1 @@
-driver-y += model_6xx_init.o
+driver-y += model_6xx_init.c

src/cpu/intel/model_f0x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f0x_init.o
+driver-y += model_f0x_init.c

src/cpu/intel/model_f1x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f1x_init.o
+driver-y += model_f1x_init.c

src/cpu/intel/model_f2x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f2x_init.o
+driver-y += model_f2x_init.c

src/cpu/intel/model_f3x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f3x_init.o
+driver-y += model_f3x_init.c

src/cpu/intel/model_f4x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f4x_init.o
+driver-y += model_f4x_init.c

src/cpu/intel/slot_1/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += slot_1.o
+ramstage-y += slot_1.c
 subdirs-y += ../model_6xx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/slot_2/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += slot_2.o
+ramstage-y += slot_2.c
 subdirs-y += ../model_6xx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_441/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_441.o
+ramstage-y += socket_441.c
 subdirs-y += ../model_106cx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_FC_PGA370/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += socket_FC_PGA370.o
+ramstage-y += socket_FC_PGA370.c
 subdirs-y += ../model_68x
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_PGA370/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += socket_PGA370.o
+ramstage-y += socket_PGA370.c
 subdirs-y += ../model_6xx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_mFCBGA479/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mFCBGA479.o
+ramstage-y += socket_mFCBGA479.c
 subdirs-y += ../model_6bx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_mFCPGA478/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mFCPGA478.o
+ramstage-y += socket_mFCPGA478.c
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
 subdirs-y += ../model_6ex

src/cpu/intel/socket_mPGA478/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA478.o
+ramstage-y += socket_mPGA478.c
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
 subdirs-y += ../../x86/tsc

src/cpu/intel/socket_mPGA479M/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA479M.o
+ramstage-y += socket_mPGA479M.c
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
 subdirs-y += ../model_f2x
@@ -10,4 +10,4 @@ subdirs-y += ../../x86/smm
 subdirs-y += ../microcode
 subdirs-y += ../hyperthreading
 
-cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc
+cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc

src/cpu/intel/socket_mPGA603/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA603_400Mhz.o
+ramstage-y += socket_mPGA603_400Mhz.c
 subdirs-y += ../model_f0x
 subdirs-y += ../model_f1x
 subdirs-y += ../model_f2x

src/cpu/intel/socket_mPGA604/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA604.o
+ramstage-y += socket_mPGA604.c
 subdirs-y += ../model_f2x
 subdirs-y += ../model_f3x
 subdirs-y += ../model_f4x

src/cpu/intel/speedstep/Makefile.inc

@@ -1 +1 @@
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c

src/cpu/via/model_c3/Makefile.inc

@@ -5,4 +5,4 @@ subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../../intel/microcode
 
-driver-y += model_c3_init.o
+driver-y += model_c3_init.c

src/cpu/via/model_c7/Makefile.inc

@@ -5,6 +5,6 @@ subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../../intel/microcode
 
-driver-y += model_c7_init.o
+driver-y += model_c7_init.c
 
 cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc

src/cpu/x86/cache/Makefile.inc

@@ -1 +1 @@
-obj-y += cache.o
+ramstage-y += cache.c

src/cpu/x86/lapic/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += lapic.o
-obj-y += lapic_cpu_init.o
-obj-y += secondary.o
-obj-$(CONFIG_UDELAY_LAPIC) += apic_timer.o
+ramstage-y += lapic.c
+ramstage-y += lapic_cpu_init.c
+ramstage-y += secondary.S
+ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c

src/cpu/x86/mtrr/Makefile.inc

@@ -1 +1 @@
-obj-y += mtrr.o
+ramstage-y += mtrr.c

src/cpu/x86/name/Makefile.inc

@@ -17,5 +17,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += name.o
+ramstage-y += name.c
 

src/cpu/x86/pae/Makefile.inc

@@ -1 +1 @@
-obj-y += pgtbl.o
+ramstage-y += pgtbl.c

src/cpu/x86/smm/Makefile.inc

@@ -17,24 +17,26 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.o
-obj-$(CONFIG_HAVE_SMI_HANDLER) += smm_wrap.o
+ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.S
+ifeq ($(CONFIG_HAVE_SMI_HANDLER),y)
+ramstage-srcs += $(obj)/cpu/x86/smm/smm_wrap
+endif
 
-smmobj-y += smmhandler.o
-smmobj-y += smihandler.o
-smmobj-y += smiutil.o
+smm-y += smmhandler.S
+smm-y += smihandler.c
+smm-y += smiutil.c
 
-$(obj)/cpu/x86/smm/smm.o: $$(smmobjs)
+$(obj)/cpu/x86/smm/smm.o: $$(smm-objs)
 	$(CC) $(LDFLAGS) -nostdlib -r -o $@ $^
 
-$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions
+$(obj)/cpu/x86/smm/smm_wrap: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions
 	$(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o
 	$(NM) -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map
 	$(OBJCOPY) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm
 
 # change to the target path because objcopy will use the path name in its
 # ELF symbol names.
-$(obj)/cpu/x86/smm/smm_wrap.o: $(obj)/cpu/x86/smm/smm
+$(obj)/cpu/x86/smm/smm_wrap.ramstage.o: $(obj)/cpu/x86/smm/smm_wrap
 	@printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
-	cd $(obj)/cpu/x86/smm; $(OBJCOPY) -I binary smm -O elf32-i386 -B i386 smm_wrap.o
+	cd $(obj)/cpu/x86/smm; $(OBJCOPY) -I binary smm -O elf32-i386 -B i386 smm_wrap.ramstage.o
 

src/cpu/x86/tsc/Makefile.inc

@@ -1,2 +1,2 @@
-obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o
+ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c