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
This commit is contained in:
parent
6e2357676f
commit
6842c0293c
2
Makefile
2
Makefile
|
@ -239,7 +239,7 @@ $(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2))
|
||||||
|
|
||||||
STACKPROTECT += $(call cc-option, -fno-stack-protector,)
|
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 += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
|
||||||
CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs
|
CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs
|
||||||
CFLAGS += -Wstrict-aliasing -Wshadow
|
CFLAGS += -Wstrict-aliasing -Wshadow
|
||||||
|
|
|
@ -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/id.lds
|
||||||
ldscript-y += ../../../../src/arch/i386/lib/failover.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}
|
\end{verbatim}
|
||||||
\subsubsection{POST\_EVALUATION}
|
\subsubsection{POST\_EVALUATION}
|
||||||
POST\_EVALUATION rules should be placed after this section:
|
POST\_EVALUATION rules should be placed after this section:
|
||||||
|
|
|
@ -54,11 +54,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
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
|
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
||||||
mv dsdt.hex $@
|
mv dsdt.hex $@
|
||||||
|
|
|
@ -45,10 +45,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
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
|
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
||||||
mv dsdt.hex $@
|
mv dsdt.hex $@
|
||||||
|
|
|
@ -46,3 +46,8 @@ config MAINBOARD_PART_NUMBER
|
||||||
default "EagleHeights"
|
default "EagleHeights"
|
||||||
depends on BOARD_INTEL_EAGLEHEIGHTS
|
depends on BOARD_INTEL_EAGLEHEIGHTS
|
||||||
|
|
||||||
|
config MMCONF_BASE_ADDRESS
|
||||||
|
hex
|
||||||
|
default 0xe0000000
|
||||||
|
depends on BOARD_INTEL_EAGLEHEIGHTS
|
||||||
|
|
||||||
|
|
|
@ -25,10 +25,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
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
|
$(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 $@
|
$(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 $@
|
perl -e 's/\.rodata/.rom.data/g' -pi $@
|
||||||
|
|
|
@ -9,6 +9,7 @@ config BOARD_KONTRON_986LCD_M
|
||||||
select HAVE_PIRQ_TABLE
|
select HAVE_PIRQ_TABLE
|
||||||
select MMCONF_SUPPORT
|
select MMCONF_SUPPORT
|
||||||
select USE_PRINTK_IN_CAR
|
select USE_PRINTK_IN_CAR
|
||||||
|
select AP_IN_SIPI_WAIT
|
||||||
help
|
help
|
||||||
Kontron 986LCD-M/mITX mainboard.
|
Kontron 986LCD-M/mITX mainboard.
|
||||||
|
|
||||||
|
@ -42,3 +43,7 @@ config MAINBOARD_PART_NUMBER
|
||||||
default "986LCD-M"
|
default "986LCD-M"
|
||||||
depends on BOARD_KONTRON_986LCD_M
|
depends on BOARD_KONTRON_986LCD_M
|
||||||
|
|
||||||
|
config MMCONF_BASE_ADDRESS
|
||||||
|
hex
|
||||||
|
default 0xf0000000
|
||||||
|
depends on BOARD_KONTRON_986LCD_M
|
||||||
|
|
|
@ -54,13 +54,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
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
|
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
||||||
mv dsdt.hex $@
|
mv dsdt.hex $@
|
||||||
|
|
|
@ -45,11 +45,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
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
|
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
||||||
mv dsdt.hex $@
|
mv dsdt.hex $@
|
||||||
|
|
|
@ -46,11 +46,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
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
|
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
|
||||||
mv dsdt.hex $@
|
mv dsdt.hex $@
|
||||||
|
|
|
@ -55,8 +55,6 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS= -DCONFIG_AP_IN_SIPI_WAIT=0
|
|
||||||
|
|
||||||
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
mv dsdt.hex $@
|
mv dsdt.hex $@
|
||||||
|
|
|
@ -45,8 +45,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS=
|
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS=
|
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
|
|
|
@ -46,8 +46,6 @@ crt0-y += cache_as_ram_auto.inc
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS=
|
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
|
|
|
@ -44,8 +44,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS=
|
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS=
|
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
|
|
|
@ -45,8 +45,6 @@ crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
MAINBOARD_OPTIONS=
|
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue