[commit] r5115 - in trunk/src: arch/i386 mainboard/gigabyte/ga_2761gxdk mainboard/gigabyte/m57sli mainboard/msi/ms7260 mainboard/msi/ms9282 mainboard/nvidia/l1_2pvv mainboard/tyan/s2912 mainboard/t...

[repository service]

Author: oxygene
Date: Thu Feb 11 09:44:20 2010
New Revision: 5115
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5115

Log:
$(DISTRO_CFLAGS) is newconfig heritage and was never used on Kconfig. We do
what it was supposed to do in xcompile now..

Moved ap_romstage.o rule to src/arch/i386/Makefile.inc, too.

Signed-off-by: Stefan Reinauer 
Acked-by: Ronald G. Minnich

Modified:
   trunk/src/arch/i386/Makefile.inc
   trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
   trunk/src/mainboard/gigabyte/m57sli/Makefile.inc
   trunk/src/mainboard/msi/ms7260/Makefile.inc
   trunk/src/mainboard/msi/ms9282/Makefile.inc
   trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc
   trunk/src/mainboard/tyan/s2912/Makefile.inc
   trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/arch/i386/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -82,8 +82,12 @@
    $(obj)/romcc $(ROMCCFLAGS) -include $(obj)/build.h $(INCLUDES) $< -o $@

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 $@
+
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o - | sed -e 's/.rodata/.rom.data/g' -e 's/.text/.section .rom.text/g' > $@.tmp
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o - | sed -e 's/.rodata/.rom.data/g' -e 's/.text/.section .rom.text/g' > $@.tmp
    mv $@.tmp $@
 endif
 endif

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -46,9 +46,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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

Modified: trunk/src/mainboard/gigabyte/m57sli/Makefile.inc
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/gigabyte/m57sli/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -51,9 +51,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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

Modified: trunk/src/mainboard/msi/ms7260/Makefile.inc
==============================================================================
--- trunk/src/mainboard/msi/ms7260/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/msi/ms7260/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -46,9 +46,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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

Modified: trunk/src/mainboard/msi/ms9282/Makefile.inc
==============================================================================
--- trunk/src/mainboard/msi/ms9282/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/msi/ms9282/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -48,9 +48,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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

Modified: trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -48,9 +48,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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

Modified: trunk/src/mainboard/tyan/s2912/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2912/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/tyan/s2912/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -48,9 +48,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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

Modified: trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc	Thu Feb 11 04:21:29 2010	(r5114)
+++ trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc	Thu Feb 11 09:44:20 2010	(r5115)
@@ -41,9 +41,3 @@
 ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
 endif

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