summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2015-07-01 10:31:49 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-07-06 09:42:12 +0200
commit9150e5e0f26a1f2908d8ab95c2f82e3ccad423dc (patch)
tree59e29c85d3b0667c20f3a5eac424ebb948a4e014
parent3740546bd849755f6c8a74634e34447e9a31d358 (diff)
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> Reviewed-on: http://review.coreboot.org/10783 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--payloads/libpayload/arch/arm/dummy_media.c3
-rw-r--r--payloads/libpayload/arch/arm64/dummy_media.c3
-rw-r--r--payloads/libpayload/arch/mips/dummy_media.c3
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 7926976422..c67344f2eb 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 7926976422..c67344f2eb 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 539773dd8e..112d7feec8 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;
}