[commit] r5279 - in trunk: . src/arch/i386

[repository service]

Author: stepan
Date: Wed Mar 24 10:53:50 2010
New Revision: 5279
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5279

Log:
CPPFLAGS and DEBUG_CFLAGS don't exist since Kconfig. Drop their remainders.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/Makefile
   trunk/src/arch/i386/Makefile.inc

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Mar 23 18:01:23 2010	(r5278)
+++ trunk/Makefile	Wed Mar 24 10:53:50 2010	(r5279)
@@ -201,7 +201,7 @@
 define objs_asl_template
 $(obj)/$(1)%.o: src/$(1)%.asl
    @printf "    IASL       $$(subst $(top)/,,$$(@))\n"
-	$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
+	$(CPP) -D__ACPI__ -P -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
    iasl -p $$(basename $$@) -tc $$(basename $$@).asl
    mv $$(basename $$@).hex $$(basename $$@).c
    $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$@).c

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Tue Mar 23 18:01:23 2010	(r5278)
+++ trunk/src/arch/i386/Makefile.inc	Wed Mar 24 10:53:50 2010	(r5279)
@@ -199,11 +199,11 @@
 else

$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
+	$(CC) $(CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@

$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h
    printf "    CC         romstage.inc\n"
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o $@.tmp1
+	$(CC) $(CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o $@.tmp1
    printf "    POST       romstage.inc\n"
    sed -e 's/.rodata/.rom.data/g' -e 's/.text/.section .rom.text/g' $@.tmp1 > $@.tmp
    mv $@.tmp $@