From 5aec84cd4a0fb4b455deb83677c1365db985e07f Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 20 May 2017 20:47:18 +0200 Subject: [PATCH] UPSTREAM: lib/coreboot_tables: Remove weak fill_lb_framebuffer() Remove the weak function stub fill_lb_framebuffer() and guard with the new `CONFIG_LINEAR_FRAMEBUFFER` instead. BUG=none BRANCH=none TEST=none Change-Id: Ibd4095700b0e89eb9c933df30af00e7acb43bb7f Signed-off-by: Patrick Georgi Original-Commit-Id: ce768f3baff20815f227fffbf1bb406f3a7dd1a7 Original-Change-Id: Ia9e477c2d501b249a632968b5636ac803323895a Original-Signed-off-by: Nico Huber Original-Reviewed-on: https://review.coreboot.org/19807 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Philippe Mathieu-Daud Reviewed-on: https://chromium-review.googlesource.com/533049 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/lib/coreboot_table.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f3cdb0bb14..aa6c7a51d6 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -135,17 +135,12 @@ void lb_add_console(uint16_t consoletype, void *data) console->type = consoletype; } -int __attribute__((weak)) fill_lb_framebuffer(struct lb_framebuffer *fb) -{ - return -1; -} - static void lb_framebuffer(struct lb_header *header) { struct lb_framebuffer *framebuffer; struct lb_framebuffer fb; - if (fill_lb_framebuffer(&fb)) + if (!IS_ENABLED(CONFIG_LINEAR_FRAMEBUFFER) || fill_lb_framebuffer(&fb)) return; framebuffer = (struct lb_framebuffer *)lb_new_record(header);