From patchwork Tue Sep 29 15:55:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: remove MAINBOARD_OPTIONS Date: Tue, 29 Sep 2009 15:55:19 -0000 From: Patrick Georgi X-Patchwork-Id: 306 Message-Id: <1254239719.6184.42.camel@tetris> To: coreboot@coreboot.org Hi, MAINBOARD_OPTIONS is used in Kconfig. Its use can be debated however, as its functionality can be replicated by using Kconfig only. Remove its uses, documentation, etc. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer Index: src/mainboard/amd/serengeti_cheetah/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah/Makefile.inc (Revision 4686) +++ src/mainboard/amd/serengeti_cheetah/Makefile.inc (Arbeitskopie) @@ -54,11 +54,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=0 \ - -DCONFIG_USE_PRINTK_IN_CAR=1 \ - -DCONFIG_HAVE_HIGH_TABLES=1 - $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl mv dsdt.hex $@ Index: src/mainboard/asus/m2v-mx_se/Makefile.inc =================================================================== --- src/mainboard/asus/m2v-mx_se/Makefile.inc (Revision 4686) +++ src/mainboard/asus/m2v-mx_se/Makefile.inc (Arbeitskopie) @@ -45,10 +45,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=0 \ - -DCONFIG_USE_PRINTK_IN_CAR=1 - $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl mv dsdt.hex $@ Index: src/mainboard/intel/eagleheights/Makefile.inc =================================================================== --- src/mainboard/intel/eagleheights/Makefile.inc (Revision 4686) +++ src/mainboard/intel/eagleheights/Makefile.inc (Arbeitskopie) @@ -25,10 +25,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS=\ - -DCONFIG_MMCONF_SUPPORT=1 \ - -DCONFIG_MMCONF_BASE_ADDRESS=0xe0000000 - $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@ perl -e 's/\.rodata/.rom.data/g' -pi $@ Index: src/mainboard/kontron/986lcd-m/Makefile.inc =================================================================== --- src/mainboard/kontron/986lcd-m/Makefile.inc (Revision 4686) +++ src/mainboard/kontron/986lcd-m/Makefile.inc (Arbeitskopie) @@ -54,13 +54,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=1 \ - -DCONFIG_USE_PRINTK_IN_CAR=1 \ - -DCONFIG_HAVE_HIGH_TABLES=1 \ - -DCONFIG_MMCONF_SUPPORT=1 \ - -DCONFIG_MMCONF_BASE_ADDRESS=0xf0000000 - $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl mv dsdt.hex $@ Index: src/mainboard/sunw/ultra40/Makefile.inc =================================================================== --- src/mainboard/sunw/ultra40/Makefile.inc (Revision 4686) +++ src/mainboard/sunw/ultra40/Makefile.inc (Arbeitskopie) @@ -45,11 +45,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=0 \ - -DCONFIG_USE_PRINTK_IN_CAR=1 \ - -DCONFIG_HAVE_HIGH_TABLES=1 - $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl mv dsdt.hex $@ Index: src/mainboard/supermicro/h8dme/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dme/Makefile.inc (Revision 4686) +++ src/mainboard/supermicro/h8dme/Makefile.inc (Arbeitskopie) @@ -46,11 +46,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=0 \ - -DCONFIG_USE_PRINTK_IN_CAR=1 \ - -DCONFIG_HAVE_HIGH_TABLES=1 - $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl mv dsdt.hex $@ Index: src/mainboard/via/epia/Makefile.inc =================================================================== --- src/mainboard/via/epia/Makefile.inc (Revision 4686) +++ src/mainboard/via/epia/Makefile.inc (Arbeitskopie) @@ -40,8 +40,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS= - $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ Index: src/mainboard/via/epia-cn/Makefile.inc =================================================================== --- src/mainboard/via/epia-cn/Makefile.inc (Revision 4686) +++ src/mainboard/via/epia-cn/Makefile.inc (Arbeitskopie) @@ -45,8 +45,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS= - $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ Index: src/mainboard/via/epia-m/Makefile.inc =================================================================== --- src/mainboard/via/epia-m/Makefile.inc (Revision 4686) +++ src/mainboard/via/epia-m/Makefile.inc (Arbeitskopie) @@ -47,8 +47,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS= - $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ Index: src/mainboard/via/epia-m700/Makefile.inc =================================================================== --- src/mainboard/via/epia-m700/Makefile.inc (Revision 4686) +++ src/mainboard/via/epia-m700/Makefile.inc (Arbeitskopie) @@ -46,8 +46,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS= - $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ Index: src/mainboard/via/epia-n/Makefile.inc =================================================================== --- src/mainboard/via/epia-n/Makefile.inc (Revision 4686) +++ src/mainboard/via/epia-n/Makefile.inc (Arbeitskopie) @@ -44,8 +44,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS= - $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ Index: src/mainboard/via/pc2500e/Makefile.inc =================================================================== --- src/mainboard/via/pc2500e/Makefile.inc (Revision 4686) +++ src/mainboard/via/pc2500e/Makefile.inc (Arbeitskopie) @@ -45,8 +45,6 @@ ifdef POST_EVALUATION -MAINBOARD_OPTIONS= - $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ Index: Makefile =================================================================== --- Makefile (Revision 4686) +++ Makefile (Arbeitskopie) @@ -239,7 +239,7 @@ STACKPROTECT += $(call cc-option, -fno-stack-protector,) -CFLAGS = $(STACKPROTECT) $(INCLUDES) $(MAINBOARD_OPTIONS) -Os -nostdinc +CFLAGS = $(STACKPROTECT) $(INCLUDES) -Os -nostdinc CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs CFLAGS += -Wstrict-aliasing -Wshadow Index: documentation/Kconfig.tex =================================================================== --- documentation/Kconfig.tex (Revision 4686) +++ documentation/Kconfig.tex (Arbeitskopie) @@ -96,15 +96,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds \end{verbatim} -\subsubsection{defines} -There are variables that should never be definable by users, as changing them will break the build or the image. These are set -in MAINBOARD\_OPTIONS. -\begin{verbatim} -MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=0 \ - -DCONFIG_USE_PRINTK_IN_CAR=1 \ - -DCONFIG_HAVE_HIGH_TABLES=1 -\end{verbatim} \subsubsection{POST\_EVALUATION} POST\_EVALUATION rules should be placed after this section: \begin{verbatim}