From 6842c0293c743ae9191d0d78fe38e1eba8391265 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 29 Sep 2009 17:28:13 +0000 Subject: 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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4687 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- Makefile | 2 +- documentation/Kconfig.tex | 9 --------- src/mainboard/amd/serengeti_cheetah/Makefile.inc | 5 ----- src/mainboard/asus/m2v-mx_se/Makefile.inc | 4 ---- src/mainboard/intel/eagleheights/Kconfig | 5 +++++ src/mainboard/intel/eagleheights/Makefile.inc | 4 ---- src/mainboard/kontron/986lcd-m/Kconfig | 5 +++++ src/mainboard/kontron/986lcd-m/Makefile.inc | 7 ------- src/mainboard/sunw/ultra40/Makefile.inc | 5 ----- src/mainboard/supermicro/h8dme/Makefile.inc | 5 ----- src/mainboard/tyan/Makefile.s289x.inc | 2 -- src/mainboard/via/epia-cn/Makefile.inc | 2 -- src/mainboard/via/epia-m/Makefile.inc | 2 -- src/mainboard/via/epia-m700/Makefile.inc | 2 -- src/mainboard/via/epia-n/Makefile.inc | 2 -- src/mainboard/via/epia/Makefile.inc | 2 -- src/mainboard/via/pc2500e/Makefile.inc | 2 -- 17 files changed, 11 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index 4423f4a5f1..fada32b0f5 100644 --- 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 32fdd19ec5..a21e7f243e 100644 --- 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 d8121d76e3..19e58bd8ae 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 9511409ede..309a1b2f68 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 92e9a382b6..8360ee293a 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 1f9c31f5eb..110ee97c89 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 333ae1cf95..b3184cd27b 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 3dc5e29fd3..bd3495ab77 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 39f12d34c8..bfba66832d 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 e51ef68290..dd111435c7 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 51a521e066..fc78b661fb 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 a6c8073117..eb24017e8e 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 08d9f07920..b029d1e733 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 2b43fcd137..dd8ab50202 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 f5429fa286..a1576c80b3 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 6acb251b23..cadb476a8a 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 a6c8073117..eb24017e8e 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 $@ -- cgit v1.2.3