Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10783
-gerrit
commit 5ab6e7f4ac35bb15333ff85e8fa1a9bfe0775b2a Author: Daisuke Nojiri dnojiri@chromium.org Date: Wed Jul 1 10:31:49 2015 -0700
cbfs: define libpayload_init_default_cbfs_media weakly
To allow a payload to define its own libpayload_init_default_cbfs_media, default implementation needs to be defined weakly.
BUG=none BRANCH=tot TEST=dumped a cbfs file from depthcharge cli on jerry
Change-Id: Ice73ae5a63dfd49e79c0eeb92d4eade016d61c39 Signed-off-by: Patrick Georgi pgeorgi@chromium.org Original-Commit-Id: 1f308177fffb0d525fdb50f8d024568bb9025352 Original-Change-Id: I4721139aea3169c62c10a2a26582bd9277e4cb83 Original-Signed-off-by: Daisuke Nojiri dnojiri@chromium.org Original-Reviewed-on: https://chromium-review.googlesource.com/283061 Original-Reviewed-by: Aaron Durbin adurbin@chromium.org --- payloads/libpayload/arch/arm/dummy_media.c | 3 ++- payloads/libpayload/arch/arm64/dummy_media.c | 3 ++- payloads/libpayload/arch/mips/dummy_media.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/payloads/libpayload/arch/arm/dummy_media.c b/payloads/libpayload/arch/arm/dummy_media.c index 7926976..c67344f 100644 --- a/payloads/libpayload/arch/arm/dummy_media.c +++ b/payloads/libpayload/arch/arm/dummy_media.c @@ -36,7 +36,8 @@
int libpayload_init_default_cbfs_media(struct cbfs_media *media);
-int libpayload_init_default_cbfs_media(struct cbfs_media *media) +__attribute__((weak)) int libpayload_init_default_cbfs_media( + struct cbfs_media *media) { return -1; } diff --git a/payloads/libpayload/arch/arm64/dummy_media.c b/payloads/libpayload/arch/arm64/dummy_media.c index 7926976..c67344f 100644 --- a/payloads/libpayload/arch/arm64/dummy_media.c +++ b/payloads/libpayload/arch/arm64/dummy_media.c @@ -36,7 +36,8 @@
int libpayload_init_default_cbfs_media(struct cbfs_media *media);
-int libpayload_init_default_cbfs_media(struct cbfs_media *media) +__attribute__((weak)) int libpayload_init_default_cbfs_media( + struct cbfs_media *media) { return -1; } diff --git a/payloads/libpayload/arch/mips/dummy_media.c b/payloads/libpayload/arch/mips/dummy_media.c index 539773d..112d7fe 100644 --- a/payloads/libpayload/arch/mips/dummy_media.c +++ b/payloads/libpayload/arch/mips/dummy_media.c @@ -35,7 +35,8 @@
int libpayload_init_default_cbfs_media(struct cbfs_media *media);
-int libpayload_init_default_cbfs_media(struct cbfs_media *media) +__attribute__((weak)) int libpayload_init_default_cbfs_media( + struct cbfs_media *media) { return -1; }