From 8463dd9db0dc2ce02423775d0eb62e28aa01e9f9 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 30 Sep 2010 16:55:02 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5886 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/x86/cache/Makefile.inc | 2 +- src/cpu/x86/lapic/Makefile.inc | 8 ++++---- src/cpu/x86/mtrr/Makefile.inc | 2 +- src/cpu/x86/name/Makefile.inc | 2 +- src/cpu/x86/pae/Makefile.inc | 2 +- src/cpu/x86/smm/Makefile.inc | 20 +++++++++++--------- src/cpu/x86/tsc/Makefile.inc | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src/cpu/x86') diff --git a/src/cpu/x86/cache/Makefile.inc b/src/cpu/x86/cache/Makefile.inc index 75679e586b..b33b9eeff0 100644 --- a/src/cpu/x86/cache/Makefile.inc +++ b/src/cpu/x86/cache/Makefile.inc @@ -1 +1 @@ -obj-y += cache.o +ramstage-y += cache.c diff --git a/src/cpu/x86/lapic/Makefile.inc b/src/cpu/x86/lapic/Makefile.inc index bed314024c..af20956a9a 100644 --- a/src/cpu/x86/lapic/Makefile.inc +++ b/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 diff --git a/src/cpu/x86/mtrr/Makefile.inc b/src/cpu/x86/mtrr/Makefile.inc index b68873e5a6..cecb8269ef 100644 --- a/src/cpu/x86/mtrr/Makefile.inc +++ b/src/cpu/x86/mtrr/Makefile.inc @@ -1 +1 @@ -obj-y += mtrr.o +ramstage-y += mtrr.c diff --git a/src/cpu/x86/name/Makefile.inc b/src/cpu/x86/name/Makefile.inc index bfe17519f2..1528ed7661 100644 --- a/src/cpu/x86/name/Makefile.inc +++ b/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 diff --git a/src/cpu/x86/pae/Makefile.inc b/src/cpu/x86/pae/Makefile.inc index e20ee2fc51..0ecec4753d 100644 --- a/src/cpu/x86/pae/Makefile.inc +++ b/src/cpu/x86/pae/Makefile.inc @@ -1 +1 @@ -obj-y += pgtbl.o +ramstage-y += pgtbl.c diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 42413510e9..85bb45472b 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/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 diff --git a/src/cpu/x86/tsc/Makefile.inc b/src/cpu/x86/tsc/Makefile.inc index d56c3e76d6..44bfe85170 100644 --- a/src/cpu/x86/tsc/Makefile.inc +++ b/src/cpu/x86/tsc/Makefile.inc @@ -1,2 +1,2 @@ -obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o +ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c -- cgit v1.2.3