From dcc63b6cb7dc60035235a97fd7bab51ed956ff54 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 14 Oct 2015 09:41:02 -0700 Subject: cbgfx: remove load_bitmap load_bitmap is no longer needed. BUG=none BRANCH=master TEST=Tested on Samus CQ-DEPEND=CL:305589 Change-Id: I4e598ade20a5d49850f9ad0f13681ea5d16cd8c7 Signed-off-by: Patrick Georgi Original-Commit-Id: 125bbc98195cbb8378ba0e4c7fece85ffca4cdfa Original-Change-Id: I64d685f7a6367b03455ae2a206b9936613614a24 Original-Signed-off-by: Daisuke Nojiri Original-Reviewed-on: https://chromium-review.googlesource.com/305517 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11930 Tested-by: build bot (Jenkins) --- payloads/libpayload/drivers/video/graphics.c | 14 -------------- payloads/libpayload/include/cbgfx.h | 12 ------------ 2 files changed, 26 deletions(-) (limited to 'payloads/libpayload') diff --git a/payloads/libpayload/drivers/video/graphics.c b/payloads/libpayload/drivers/video/graphics.c index 52c003511c..167433b596 100644 --- a/payloads/libpayload/drivers/video/graphics.c +++ b/payloads/libpayload/drivers/video/graphics.c @@ -149,20 +149,6 @@ static int cbgfx_init(void) return 0; } -void *load_bitmap(const char *name, size_t *size) -{ - static struct cbfs_media media; - static int cbfs_media_initialized = 0; - if (!cbfs_media_initialized) { - if (init_default_cbfs_media(&media)) { - printf("Failed to initialize default media\n"); - return NULL; - } - } - cbfs_media_initialized = 1; - return cbfs_get_file_content(&media, name, CBFS_TYPE_RAW, size); -} - int draw_box(const struct rect *box, const struct rgb_color *rgb) { struct vector top_left; diff --git a/payloads/libpayload/include/cbgfx.h b/payloads/libpayload/include/cbgfx.h index 4ab4943075..7ae966dcc9 100644 --- a/payloads/libpayload/include/cbgfx.h +++ b/payloads/libpayload/include/cbgfx.h @@ -73,18 +73,6 @@ struct rgb_color { * y values increasing towards bottom of screen. */ -/** - * Load a bitmap file from cbfs - * - * Memory is allocated automatically and it's caller's responsibility to free it - * - * name: name of the bitmap file - * size: (OUT) size of the image - * - * return: pointer to the image data in memory or NULL on error - */ -void *load_bitmap(const char *name, size_t *size); - /** * draw a box filled with a color on screen * -- cgit v1.2.3