summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2020-03-05 18:04:12 -0800
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2020-03-11 12:31:28 +0000
commit1645ecc8f65a80c93719e62f3e0de0d441c1f822 (patch)
treeadb1336165ee37c7584605da155d3b94e54dab40
parent5674bf15f929932f7cbfd6c1e36a26510d9ec0bf (diff)
cbfs: Remove unused functions
cbfs_boot_load_stage_by_name() and cbfs_prog_stage_section() are no longer used. Remove them to make refactoring the rest of the CBFS API easier. Signed-off-by: Julius Werner <jwerner@chromium.org> Change-Id: Ie44a9507c4a03499b06cdf82d9bf9c02a8292d5e Reviewed-on: https://review.coreboot.org/c/coreboot/+/39334 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
-rw-r--r--src/include/cbfs.h8
-rw-r--r--src/lib/cbfs.c30
2 files changed, 0 insertions, 38 deletions
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index 2d16aa761a..2fe2ce0f35 100644
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -25,9 +25,6 @@
/* Return mapping of option ROM found in boot device. NULL on error. */
void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device);
-/* Load stage by name into memory. Returns entry address on success. NULL on
- * failure. */
-void *cbfs_boot_load_stage_by_name(const char *name);
/* Locate file by name and optional type. Return 0 on success. < 0 on error. */
int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type);
/* Map file into memory leaking the mapping. Only should be used when
@@ -51,11 +48,6 @@ size_t cbfs_boot_load_file(const char *name, void *buf, size_t buf_size,
size_t cbfs_load_and_decompress(const struct region_device *rdev, size_t offset,
size_t in_size, void *buffer, size_t buffer_size, uint32_t compression);
-/* Return the size and fill base of the memory pstage will occupy after
- * loaded.
- */
-size_t cbfs_prog_stage_section(struct prog *pstage, uintptr_t *base);
-
/* Load stage into memory filling in prog. Return 0 on success. < 0 on error. */
int cbfs_prog_stage_load(struct prog *prog);
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index c712f76be8..7acfc224e5 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -179,24 +179,6 @@ void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device)
return cbfs_boot_map_with_leak(name, CBFS_TYPE_OPTIONROM, NULL);
}
-void *cbfs_boot_load_stage_by_name(const char *name)
-{
- struct cbfsf fh;
- struct prog stage = PROG_INIT(PROG_UNKNOWN, name);
- uint32_t type = CBFS_TYPE_STAGE;
-
- if (cbfs_boot_locate(&fh, name, &type))
- return NULL;
-
- /* Chain data portion in the prog. */
- cbfs_file_data(prog_rdev(&stage), &fh);
-
- if (cbfs_prog_stage_load(&stage))
- return NULL;
-
- return prog_entry(&stage);
-}
-
size_t cbfs_boot_load_file(const char *name, void *buf, size_t buf_size,
uint32_t type)
{
@@ -217,18 +199,6 @@ size_t cbfs_boot_load_file(const char *name, void *buf, size_t buf_size,
buf, buf_size, compression_algo);
}
-size_t cbfs_prog_stage_section(struct prog *pstage, uintptr_t *base)
-{
- struct cbfs_stage stage;
- const struct region_device *fh = prog_rdev(pstage);
-
- if (rdev_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage))
- return 0;
-
- *base = (uintptr_t)stage.load;
- return stage.memlen;
-}
-
int cbfs_prog_stage_load(struct prog *pstage)
{
struct cbfs_stage stage;