Remove MAINBOARD_OPTIONS, which is a relic from early

kconfig development.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4687 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/Makefile b/Makefile
index 4423f4a5f19b884850f718221b9d92b9e78dd2c9..fada32b0f5fb32bcdd445c29a7da3e7327929993 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,7 @@ $(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2))
 
 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 

diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex
index 32fdd19ec5f6924e2ae0e1dd6febfda21fa9024c..a21e7f243e44343cb53214ad1cf1568ce82f3e52 100644 (file)
--- a/documentation/Kconfig.tex
+++ b/documentation/Kconfig.tex
@@ -95,15 +95,6 @@ ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds
 ldscript-y += ../../../../src/arch/i386/lib/id.lds
 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:

diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
index d8121d76e39585de6c2de2c1c32fc0e5bc607493..19e58bd8ae5a8810df54fac97b925118f47386f0 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
@@ -54,11 +54,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc
index 9511409ede0d096e2609c86877bcede65931090a..309a1b2f6833972281baf746f81b35dc672ef528 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Makefile.inc
+++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc
@@ -45,10 +45,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index 92e9a382b6ed1b05e77d21b1abd186a46727ca9c..8360ee293ab94a554c66bd37fbe397efa272009a 100644 (file)
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -46,3 +46,8 @@ config MAINBOARD_PART_NUMBER
        default "EagleHeights"
        depends on BOARD_INTEL_EAGLEHEIGHTS
 
+config MMCONF_BASE_ADDRESS
+       hex
+       default 0xe0000000
+       depends on BOARD_INTEL_EAGLEHEIGHTS
+

diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc
index 1f9c31f5eb7c796aaba36536abf3a8d974eca708..110ee97c89d7e9797859b1df437dac9bdda66a22 100644 (file)
--- a/src/mainboard/intel/eagleheights/Makefile.inc
+++ b/src/mainboard/intel/eagleheights/Makefile.inc
@@ -25,10 +25,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 333ae1cf95375f3ea10637873d2fe95adf3d296e..b3184cd27b12929ad70310c3c0d92b1a2d5a240b 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -9,6 +9,7 @@ config BOARD_KONTRON_986LCD_M
        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 @@ config MAINBOARD_PART_NUMBER
        default "986LCD-M"
        depends on BOARD_KONTRON_986LCD_M
 
+config MMCONF_BASE_ADDRESS
+       hex
+       default 0xf0000000
+       depends on BOARD_KONTRON_986LCD_M

diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc
index 3dc5e29fd30d5b11119e9cd0e2ac4cede433909e..bd3495ab7787600751e7fac186a18265ba36ecf6 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/Makefile.inc
+++ b/src/mainboard/kontron/986lcd-m/Makefile.inc
@@ -54,13 +54,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/sunw/ultra40/Makefile.inc b/src/mainboard/sunw/ultra40/Makefile.inc
index 39f12d34c864c428ef57b3cc4ce4b2dec973794e..bfba66832de14ecb8e50f7be07bffd97d314e9a9 100644 (file)
--- a/src/mainboard/sunw/ultra40/Makefile.inc
+++ b/src/mainboard/sunw/ultra40/Makefile.inc
@@ -45,11 +45,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc
index e51ef68290e809599fc26b2d9ee50af58d67be5e..dd111435c79a363c73641ee2d5ca053a225c2e22 100644 (file)
--- a/src/mainboard/supermicro/h8dme/Makefile.inc
+++ b/src/mainboard/supermicro/h8dme/Makefile.inc
@@ -46,11 +46,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/tyan/Makefile.s289x.inc b/src/mainboard/tyan/Makefile.s289x.inc
index 51a521e066a6009280a56ec3a983b058023d5f38..fc78b661fbcbef2094f3febe3394df38bdecd47a 100644 (file)
--- a/src/mainboard/tyan/Makefile.s289x.inc
+++ b/src/mainboard/tyan/Makefile.s289x.inc
@@ -55,8 +55,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 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 $@

diff --git a/src/mainboard/via/epia-cn/Makefile.inc b/src/mainboard/via/epia-cn/Makefile.inc
index a6c8073117b987e9952d33ded37e3353c8273bbe..eb24017e8e3c708357060df7bd0f57df4fb542ee 100644 (file)
--- a/src/mainboard/via/epia-cn/Makefile.inc
+++ b/src/mainboard/via/epia-cn/Makefile.inc
@@ -45,8 +45,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
 
 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 $@
 

diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index 08d9f079205d41db6fe83076ea984517d72248d8..b029d1e733af7949e3873645d32dd79d926ba191 100644 (file)
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@@ -47,8 +47,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
 
 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 $@
 

diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc
index 2b43fcd137e7917e3c7a2f34aaf5d645cfe2a7d9..dd8ab50202e1ca8d9452d2dcf1656c650402d8e7 100644 (file)
--- a/src/mainboard/via/epia-m700/Makefile.inc
+++ b/src/mainboard/via/epia-m700/Makefile.inc
@@ -46,8 +46,6 @@ crt0-y += cache_as_ram_auto.inc
 
 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 $@
 

diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index f5429fa2863d179c210c6ad22027d63bac69ecdd..a1576c80b36882148c1095194063e4407fbef5bc 100644 (file)
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@@ -44,8 +44,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
 
 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 $@
 

diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
index 6acb251b2316246655c94d914c760c7ed97136a5..cadb476a8a36545c590b9e96f572216d27947a1f 100644 (file)
--- a/src/mainboard/via/epia/Makefile.inc
+++ b/src/mainboard/via/epia/Makefile.inc
@@ -40,8 +40,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
 
 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 $@
 

diff --git a/src/mainboard/via/pc2500e/Makefile.inc b/src/mainboard/via/pc2500e/Makefile.inc
index a6c8073117b987e9952d33ded37e3353c8273bbe..eb24017e8e3c708357060df7bd0f57df4fb542ee 100644 (file)
--- a/src/mainboard/via/pc2500e/Makefile.inc
+++ b/src/mainboard/via/pc2500e/Makefile.inc
@@ -45,8 +45,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
 
 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 $@