[coreboot] [v2] r4687 - in trunk/coreboot-v2: . documentation src/mainboard/amd/serengeti_cheetah src/mainboard/asus/m2v-mx_se src/mainboard/intel/eagleheights src/mainboard/kontron/986lcd-m src/mainboard/sunw/ultra40 src/mainboard/supermicro/h8dme src/mainboard/tyan src/mainboard/via/epia src/mainboard/via/epia-cn src/mainboard/via/epia-m src/mainboard/via/epia-m700 src/mainboard/via/epia-n src/mainboard/via/pc2500e

Author: oxygene
Date: 2009-09-29 19:28:13 +0200 (Tue, 29 Sep 2009)
New Revision: 4687

Modified:
   trunk/coreboot-v2/Makefile
   trunk/coreboot-v2/documentation/Kconfig.tex
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc
   trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc
   trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc
   trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc
   trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc
Log:
Remove MAINBOARD_OPTIONS, which is a relic from early
kconfig development.

Signed-off-by: Patrick Georgi 
Acked-by: Ronald G. Minnich 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/Makefile
===================================================================
--- trunk/coreboot-v2/Makefile	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/Makefile	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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

Modified: trunk/coreboot-v2/documentation/Kconfig.tex
===================================================================
--- trunk/coreboot-v2/documentation/Kconfig.tex	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/documentation/Kconfig.tex	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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}

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig	2009-09-29 17:28:13 UTC (rev 4687)
@@ -46,3 +46,8 @@
    default "EagleHeights"
    depends on BOARD_INTEL_EAGLEHEIGHTS

+config MMCONF_BASE_ADDRESS
+	hex
+	default 0xe0000000
+	depends on BOARD_INTEL_EAGLEHEIGHTS
+

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig	2009-09-29 17:28:13 UTC (rev 4687)
@@ -9,6 +9,7 @@
    select HAVE_PIRQ_TABLE
    select MMCONF_SUPPORT
    select USE_PRINTK_IN_CAR
+	select AP_IN_SIPI_WAIT
    help
           Kontron 986LCD-M/mITX mainboard.

@@ -42,3 +43,7 @@
    default "986LCD-M"
    depends on BOARD_KONTRON_986LCD_M

+config MMCONF_BASE_ADDRESS
+	hex
+	default 0xf0000000
+	depends on BOARD_KONTRON_986LCD_M

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -55,8 +55,6 @@

ifdef POST_EVALUATION

-MAINBOARD_OPTIONS= -DCONFIG_AP_IN_SIPI_WAIT=0
-
 $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
    iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
    mv dsdt.hex $@

Modified: trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@

Modified: trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc	2009-09-29 14:56:15 UTC (rev 4686)
+++ trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc	2009-09-29 17:28:13 UTC (rev 4687)
@@ -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 $@