In 2007 Adrian Reber suggested that we drop ASSEMBLY in favor of __ASSEMBLER__.

http://www.coreboot.org/pipermail/coreboot/2007-September/024665.html

It's about time we follow this advice.

Also move some manually set __PRE_RAM__ defines (ap_romstage.c) to the Makefile and
drop unused CPP define

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6482 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2011-04-10 04:15:23 +00:00
committed by Stefan Reinauer
parent df6fd566ba
commit 61aee5f4b1
23 changed files with 17 additions and 46 deletions

View File

@@ -50,10 +50,8 @@ subdirs-$(CONFIG_ARCH_X86) += src/pc80
# Add source classes and their build options
classes-y := ramstage romstage driver smm
ramstage-S-ccopts:=-DASSEMBLY
romstage-c-ccopts:=-D__PRE_RAM__
romstage-S-ccopts:=-DASSEMBLY -D__PRE_RAM__
driver-S-ccopts:=-DASSEMBLY
romstage-S-ccopts:=-D__PRE_RAM__
ramstage-c-deps:=$$(OPTION_TABLE_H)
romstage-c-deps:=$$(OPTION_TABLE_H)
@@ -63,7 +61,7 @@ romstage-c-deps:=$$(OPTION_TABLE_H)
define ramstage-objs_asl_template
$(obj)/$(1).ramstage.o: src/$(1).asl $(obj)/config.h
@printf " IASL $$(subst $(top)/,,$$(@))\n"
$(CPP) -MMD -MT $$(@) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
$(CC) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
iasl -p $$(obj)/$(1) -tc $$(basename $$@).asl
mv $$(obj)/$(1).hex $$(basename $$@).c
$(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$@).c