summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2017-05-16 21:39:50 -0500
committerAaron Durbin <adurbin@chromium.org>2017-05-18 15:42:23 +0200
commitbdb5c8feaed4cf914b474deeb30686e327ee9228 (patch)
tree0c4a68347fece1616c062abb2c607e0c734c30a2 /src/lib
parent43314ffae53b813c6a0d6e34723921316cf46f45 (diff)
downloadcoreboot-bdb5c8feaed4cf914b474deeb30686e327ee9228.tar.xz
coreboot_tables: specify clear interface for lb_framebuffer()
For some reason the "interface" for adding framebuffer information is sitting in src/include/vbe.h while also guarding the call to fill_lb_framebuffer() with vbe_mode_info_valid() along with some macro if CONFIG_* for good measure. Move the fill_lb_framebuffer() declaration to coreboot_tables.h and provide a comment about how it should be used. Also, now that there's no need for the notion of a global vbe_mode_info_valid() remove it from the conditional call path of fill_lb_framebuffer(). Change-Id: Ib3ade6314624091ae70424664527a02b279d0c9b Signed-off-by: Aaron Durbin <adurbin@chromium.org> Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/19729 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/coreboot_table.c21
-rw-r--r--src/lib/edid.c10
2 files changed, 16 insertions, 15 deletions
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index ecefba544c..f3cdb0bb14 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -135,22 +135,23 @@ void lb_add_console(uint16_t consoletype, void *data)
console->type = consoletype;
}
-void __attribute__((weak)) lb_framebuffer(struct lb_header *header)
+int __attribute__((weak)) fill_lb_framebuffer(struct lb_framebuffer *fb)
{
-#if CONFIG_FRAMEBUFFER_KEEP_VESA_MODE || CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
- void fill_lb_framebuffer(struct lb_framebuffer *framebuffer);
- int vbe_mode_info_valid(void);
+ return -1;
+}
- // If there isn't any mode info to put in the table, don't ask for it
- // to be filled with junk.
- if (!vbe_mode_info_valid())
- return;
+static void lb_framebuffer(struct lb_header *header)
+{
struct lb_framebuffer *framebuffer;
+ struct lb_framebuffer fb;
+
+ if (fill_lb_framebuffer(&fb))
+ return;
+
framebuffer = (struct lb_framebuffer *)lb_new_record(header);
- fill_lb_framebuffer(framebuffer);
+ memcpy(framebuffer, &fb, sizeof(*framebuffer));
framebuffer->tag = LB_TAG_FRAMEBUFFER;
framebuffer->size = sizeof(*framebuffer);
-#endif
}
void lb_add_gpios(struct lb_gpios *gpios, const struct lb_gpio *gpio_table,
diff --git a/src/lib/edid.c b/src/lib/edid.c
index 405b3fdbc1..2216690963 100644
--- a/src/lib/edid.c
+++ b/src/lib/edid.c
@@ -1750,13 +1750,13 @@ void set_vbe_mode_info_valid(const struct edid *edid, uintptr_t fb_addr)
}
#if IS_ENABLED(CONFIG_NATIVE_VGA_INIT_USE_EDID)
-int vbe_mode_info_valid(void)
+int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{
- return vbe_valid;
-}
+ if (!vbe_valid)
+ return -1;
-void fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
-{
*framebuffer = edid_fb;
+
+ return 0;
}
#endif