summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers
diff options
context:
space:
mode:
authorPaul Menzel <pmenzel@molgen.mpg.de>2017-08-07 16:56:10 +0200
committerPatrick Georgi <pgeorgi@google.com>2017-08-10 12:07:13 +0000
commit12a3fbdb7ed65a89810e606f336556fa737a3215 (patch)
tree8d5b7b03864f4d9a0f55e019559a2eb8757b5134 /payloads/libpayload/drivers
parent60ce6152fd3ab299920cfe984698f85279360a51 (diff)
libpayload: Use a static copy of `font_glyph_filled()`
libpayload needs a static copy of the out of line function `font_glyph_filled()` in every TU that needs it. So make it static inline. This fixes a build error by gcc (Debian 7.1.0-12) 7.1.0 from Debian Sid/unstable. This happens with any libpayload based payload like coreinfo, nvramcui or tint. ``` […] LPCC build/coreinfo.elf (LINK) /src/coreboot/payloads/coreinfo/build/libpayload/bin/../lib/libpayload.a(corebootfb.libc.o): In function `corebootfb_putchar': /src/coreboot/payloads/libpayload/drivers/video/corebootfb.c:173: undefined reference to `font_glyph_filled' […] ``` Change-Id: I931f0f17b33abafdc49aa755a0dad65e28820750 Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> Reviewed-on: https://review.coreboot.org/20897 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/drivers')
-rw-r--r--payloads/libpayload/drivers/video/font.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/payloads/libpayload/drivers/video/font.h b/payloads/libpayload/drivers/video/font.h
index 9ea328c78d..cfb679bbd0 100644
--- a/payloads/libpayload/drivers/video/font.h
+++ b/payloads/libpayload/drivers/video/font.h
@@ -36,7 +36,7 @@ extern int font_width;
extern int font_height;
extern int font_scale;
-inline int font_glyph_filled(unsigned int ch, int x, int y)
+static inline int font_glyph_filled(unsigned int ch, int x, int y)
{
unsigned char *glyph = font8x16 + ((ch & 0xFF) * FONT_HEIGHT);
return glyph[y/font_scale] & (1 << x/font_scale);