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
This commit is contained in:
2
src/cpu/x86/cache/Makefile.inc
vendored
2
src/cpu/x86/cache/Makefile.inc
vendored
@@ -1 +1 @@
|
||||
obj-y += cache.o
|
||||
ramstage-y += cache.c
|
||||
|
@@ -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
|
||||
|
@@ -1 +1 @@
|
||||
obj-y += mtrr.o
|
||||
ramstage-y += mtrr.c
|
||||
|
@@ -17,5 +17,5 @@
|
||||
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
##
|
||||
|
||||
obj-y += name.o
|
||||
ramstage-y += name.c
|
||||
|
||||
|
@@ -1 +1 @@
|
||||
obj-y += pgtbl.o
|
||||
ramstage-y += pgtbl.c
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,2 +1,2 @@
|
||||
obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o
|
||||
ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c
|
||||
|
||||
|
Reference in New Issue
Block a user