summaryrefslogtreecommitdiff
path: root/src/commonlib
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-12-11 16:50:02 -0800
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2020-10-30 11:14:11 +0000
commit1cd013bec5967ca1d0203de0f506a8af984f814e (patch)
treeb97e866e7c7420884f835121c742ebd2c1c08a85 /src/commonlib
parent0655f78041ef617844f436306fa5431e211f4431 (diff)
downloadcoreboot-1cd013bec5967ca1d0203de0f506a8af984f814e.tar.xz
cbfs: Hook up to new CBFS implementation
This patch hooks coreboot up to the new commonlib/bsd CBFS implementation. This is intended as the "minimum viable patch" that makes the new implementation useable with the smallest amount of changes -- that is why some of this may look a bit roundabout (returning the whole metadata for a file but then just using that to fill out the rdevs of the existing struct cbfsf). Future changes will migrate the higher level CBFS APIs one-by-one to use the new implementation directly (rather than translated into the results of the old one), at which point this will become more efficient. Change-Id: I4d112d1239475920de2d872dac179c245275038d Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38422 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/commonlib')
-rw-r--r--src/commonlib/Makefile.inc7
-rw-r--r--src/commonlib/cbfs.c15
-rw-r--r--src/commonlib/include/commonlib/cbfs.h3
3 files changed, 9 insertions, 16 deletions
diff --git a/src/commonlib/Makefile.inc b/src/commonlib/Makefile.inc
index 5bd6cf9e65..b2225cb114 100644
--- a/src/commonlib/Makefile.inc
+++ b/src/commonlib/Makefile.inc
@@ -30,6 +30,13 @@ ramstage-y += cbfs.c
smm-y += cbfs.c
postcar-y += cbfs.c
+bootblock-y += bsd/cbfs_private.c
+verstage-y += bsd/cbfs_private.c
+romstage-y += bsd/cbfs_private.c
+postcar-y += bsd/cbfs_private.c
+ramstage-y += bsd/cbfs_private.c
+smm-y += bsd/cbfs_private.c
+
decompressor-y += bsd/lz4_wrapper.c
bootblock-y += bsd/lz4_wrapper.c
verstage-y += bsd/lz4_wrapper.c
diff --git a/src/commonlib/cbfs.c b/src/commonlib/cbfs.c
index 115f99a68e..999c35e52a 100644
--- a/src/commonlib/cbfs.c
+++ b/src/commonlib/cbfs.c
@@ -7,21 +7,6 @@
#include <string.h>
#include <vb2_sha.h>
-#if !defined(LOG)
-#define LOG(x...) printk(BIOS_INFO, "CBFS: " x)
-#endif
-#if defined(CONFIG)
-
-#if CONFIG(DEBUG_CBFS)
-#define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x)
-#else
-#define DEBUG(x...)
-#endif
-
-#elif !defined(DEBUG)
-#define DEBUG(x...)
-#endif
-
static size_t cbfs_next_offset(const struct region_device *cbfs,
const struct cbfsf *f)
{
diff --git a/src/commonlib/include/commonlib/cbfs.h b/src/commonlib/include/commonlib/cbfs.h
index 90aa0b2571..6565c1dcd3 100644
--- a/src/commonlib/include/commonlib/cbfs.h
+++ b/src/commonlib/include/commonlib/cbfs.h
@@ -3,7 +3,7 @@
#ifndef _COMMONLIB_CBFS_H_
#define _COMMONLIB_CBFS_H_
-#include <commonlib/bsd/cbfs_serialized.h>
+#include <commonlib/bsd/cbfs_private.h>
#include <commonlib/region.h>
#include <vb2_api.h>
@@ -11,6 +11,7 @@
struct cbfsf {
struct region_device metadata;
struct region_device data;
+ union cbfs_mdata mdata;
};
/* Locate file by name and optional type. Returns 0 on success else < 0 on