diff options
author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-09-29 17:28:13 +0000 |
---|---|---|
committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-09-29 17:28:13 +0000 |
commit | 6842c0293c743ae9191d0d78fe38e1eba8391265 (patch) | |
tree | 55dd281da32d4e456fa62b1cafebfaabb1e914ba | |
parent | 6e2357676fb9ccf202ac3dbc66c83a040f061a4e (diff) | |
download | coreboot-staging-6842c0293c743ae9191d0d78fe38e1eba8391265.zip coreboot-staging-6842c0293c743ae9191d0d78fe38e1eba8391265.tar.gz |
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
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | documentation/Kconfig.tex | 9 | ||||
-rw-r--r-- | src/mainboard/amd/serengeti_cheetah/Makefile.inc | 5 | ||||
-rw-r--r-- | src/mainboard/asus/m2v-mx_se/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/intel/eagleheights/Kconfig | 5 | ||||
-rw-r--r-- | src/mainboard/intel/eagleheights/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/Kconfig | 5 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/Makefile.inc | 7 | ||||
-rw-r--r-- | src/mainboard/sunw/ultra40/Makefile.inc | 5 | ||||
-rw-r--r-- | src/mainboard/supermicro/h8dme/Makefile.inc | 5 | ||||
-rw-r--r-- | src/mainboard/tyan/Makefile.s289x.inc | 2 | ||||
-rw-r--r-- | src/mainboard/via/epia-cn/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/via/epia-m/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/via/epia-m700/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/via/epia-n/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/via/epia/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/via/pc2500e/Makefile.inc | 2 |
17 files changed, 11 insertions, 54 deletions
@@ -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 32fdd19..a21e7f2 100644 --- a/documentation/Kconfig.tex +++ b/documentation/Kconfig.tex @@ -96,15 +96,6 @@ 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: \begin{verbatim} diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index d8121d7..19e58bd 100644 --- 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 9511409..309a1b2 100644 --- 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 92e9a38..8360ee2 100644 --- 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 1f9c31f..110ee97 100644 --- 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 333ae1c..b3184cd 100644 --- 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 3dc5e29..bd3495a 100644 --- 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 39f12d3..bfba668 100644 --- 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 e51ef68..dd11143 100644 --- 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 51a521e..fc78b66 100644 --- 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 a6c8073..eb24017 100644 --- 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 08d9f07..b029d1e 100644 --- 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 2b43fcd..dd8ab50 100644 --- 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 f5429fa..a1576c8 100644 --- 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 6acb251..cadb476 100644 --- 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 a6c8073..eb24017 100644 --- 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 $@ |