Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1479
-gerrit
commit ed752d5fc1eb5e704284f6011d3f67587ee79c25 Author: Alexandru Gagniuc mr.nuke.me@gmail.com Date: Thu Aug 23 03:41:50 2012 -0500
mptable: don't require mptable.c when generating from devtree
Adding auto MPTABLE geeration broke the build. Not because of Sven, but because the stupid buildsystem _requires_ an empty mptable.c. Fix that (the requiring of empty mptable.c). The sad part is we need yet another kconfig variable. The happy part: In the future this should be the default.
Also, ASUS DSBF had an empty mptable.c. get rid of it.
Change-Id: I85aa669225d7a7c3db0c9bedd64722dedbb97c36 Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com --- src/Kconfig | 11 +++++++++++ src/arch/x86/Makefile.inc | 3 +++ src/mainboard/asus/dsbf/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 1 + 4 files changed, 16 insertions(+)
diff --git a/src/Kconfig b/src/Kconfig index ccf8665..250d7e9 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1,6 +1,7 @@ ## ## This file is part of the coreboot project. ## +## Copyright (C) 2012 Alexandru Gagniuc mr.nuke.me@gmail.com ## Copyright (C) 2009-2010 coresystems GmbH ## ## This program is free software; you can redistribute it and/or modify @@ -366,6 +367,16 @@ config HAVE_MP_TABLE Whether or not the MP table is actually generated by coreboot is configurable by the user via GENERATE_MP_TABLE.
+config MP_TABLE_FROM_DEVICETREE + bool + help + This variable specifies whether a given board has support for + generating the MP table from devicetree.cb. + It is usually set in mainboard/*/Kconfig. When this variable is set, + mainboard/*/mptable.c will not be needed. + Whether or not the MP table is actually generated by coreboot + is configurable by the user via GENERATE_MP_TABLE. + config HAVE_PIRQ_TABLE bool help diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 71d359f..6799ef3 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -1,6 +1,7 @@ ## ## This file is part of the coreboot project. ## +## Copyright (C) 2012 Alexandru Gagniuc mr.nuke.me@gmail.com ## Copyright (C) 2009-2010 coresystems GmbH ## Copyright (C) 2009 Ronald G. Minnich ## @@ -237,8 +238,10 @@ endif romstage-srcs += $(objgenerated)/crt0.s ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard.c ifeq ($(CONFIG_GENERATE_MP_TABLE),y) +ifeq ($(MP_TABLE_FROM_DEVICETREE),n) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mptable.c endif +endif ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/irq_tables.c endif diff --git a/src/mainboard/asus/dsbf/Kconfig b/src/mainboard/asus/dsbf/Kconfig index 436ef0c..a7d5147 100644 --- a/src/mainboard/asus/dsbf/Kconfig +++ b/src/mainboard/asus/dsbf/Kconfig @@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select BOARD_ROMSIZE_KB_512 select HAVE_MP_TABLE + select MP_TABLE_FROM_DEVICETREE select HAVE_PIRQ_TABLE select DRIVERS_I2C_W83793 select DRIVERS_GENERIC_IOAPIC diff --git a/src/mainboard/asus/dsbf/mptable.c b/src/mainboard/asus/dsbf/mptable.c deleted file mode 100644 index e69de29..0000000 diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 5bc3a3e..2ec1066 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_MP_TABLE + select MP_TABLE_FROM_DEVICETREE select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER select MMCONF_SUPPORT