Denis Carikli (GNUtoo@no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3998
-gerrit
commit cbc32c6bfa603c2458d0c5185bef5d1f9d618759 Author: Denis 'GNUtoo' Carikli GNUtoo@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: I80817a8d14758fea2178edc1d840d59ff38b4711 Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@no-log.org --- src/device/Kconfig | 5 +++++ src/lib/edid.c | 2 ++ src/mainboard/lenovo/x60/Kconfig | 1 + 3 files changed, 8 insertions(+)
diff --git a/src/device/Kconfig b/src/device/Kconfig index 2d6e226..d0dd31a 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/edid.c b/src/lib/edid.c index 4be0dc6..f604cc3 100644 --- a/src/lib/edid.c +++ b/src/lib/edid.c @@ -1466,6 +1466,7 @@ void set_vbe_mode_info_valid(struct edid *edid, uintptr_t fb_addr) vbe_valid = 1; }
+#if !CONFIG_MAINBOARD_DO_EDID int vbe_mode_info_valid(void) { return vbe_valid; @@ -1475,3 +1476,4 @@ void fill_lb_framebuffer(struct lb_framebuffer *framebuffer) { *framebuffer = edid_fb; } +#endif diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 52d4009..c51e0d3 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 select H8_DOCK_EARLY_INIT