[coreboot-gerrit] Patch set updated for coreboot: f76d3c3 Lenovo X60: Native VGA init: Fix compilation.
Denis Carikli (GNUtoo@no-log.org)
gerrit at coreboot.org
Sun Oct 27 20:53:24 CET 2013
Denis Carikli (GNUtoo at no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3997
-gerrit
commit f76d3c33eaeb7b18b2f4d4bb9d04f7326f32c16b
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date: Sun Oct 27 19:07:55 2013 +0100
Lenovo X60: Native VGA init: Fix compilation.
Without that fix, we have:
build/lib/ramstage.o: In function `vbe_mode_info_valid':
[...]/src/lib/edid.c:1451: multiple definition of `vbe_mode_info_valid'
build/mainboard/lenovo/x60/ramstage.o:[...]/src/mainboard/lenovo/x60/i915.c:200: first defined here
build/lib/ramstage.o: In function `fill_lb_framebuffer':
[...]/src/lib/edid.c:1454: multiple definition of `fill_lb_framebuffer'
build/mainboard/lenovo/x60/ramstage.o:[...]/src/mainboard/lenovo/x60/i915.c:204: first defined here
When we compile with CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
Change-Id: I1162f4e53861a269eba2f94d41e014da48d536e7
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
---
src/device/Kconfig | 5 +++++
src/lib/Makefile.inc | 2 ++
src/mainboard/lenovo/x60/Kconfig | 1 +
3 files changed, 8 insertions(+)
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 4087f6f..f3b5155 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -25,6 +25,11 @@ config MAINBOARD_HAS_NATIVE_VGA_INIT
bool
default n
+# Only set this in the mainboard
+config MAINBOARD_DO_EDID
+ bool
+ default n
+
config MAINBOARD_DO_NATIVE_VGA_INIT
bool "Use native graphics initialization"
depends on MAINBOARD_HAS_NATIVE_VGA_INIT
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b0d9366..2a2a4eb 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -97,7 +97,9 @@ ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
ramstage-$(CONFIG_TRACE) += trace.c
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
ramstage-$(CONFIG_COVERAGE) += libgcov.c
+ifneq ($(CONFIG_MAINBOARD_DO_EDID),y)
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += edid.c
+endif
ramstage-y += memrange.c
ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index 90d472c..9441e7b 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select USE_OPTION_TABLE
select MAINBOARD_HAS_NATIVE_VGA_INIT
+ select MAINBOARD_DO_EDID
select EARLY_CBMEM_INIT
config MAINBOARD_DIR
More information about the coreboot-gerrit
mailing list