diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2013-05-28 09:25:32 -0500 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-07-31 18:32:37 +0200 |
| commit | 82683ab9d4435d46d4d61cf58de32d405cbda84f (patch) | |
| tree | 347b478339f209839218137876ed1e8e25541659 /payloads/libpayload/arch/armv7/Makefile.inc | |
| parent | 0682cfefdb888807bef6ee7f3bb81615282e0390 (diff) | |
libpayload: provide missing cbfs symbol
The generic cbfs code relies on the libpayload_init_default_cbfs_media
symbol. However, none was provided for ARM. Provide an empty
implementation that returns an error as there is no generic way
to locate the default cbfs media.
Old-Change-Id: Ie0d06fbe6fc790c9d92434cd2d60922908acdc69
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/56805
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
(cherry picked from commit d3410c28ef9f37b832e2fa2d18351dda332bc9f7)
libpayload: place dummy_media.c in correct object list
The commit introducing dummy_media.c was placed in the
libc object list. This wasn't correct. It should be in the
libcbfs object list as well as guarded by CONFIG_CBFS.
Old-Change-Id: Iace43fff8f85f60ecac5e6eb8350cd1f3ee9d35e
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/56925
(cherry picked from commit 7937c7c5e95a934593bc0cedd5f4496b4770c303)
Squashed two related commits.
Change-Id: I84cd132b44cc2ea5b29acf109a3562baaeede9c6
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6411
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'payloads/libpayload/arch/armv7/Makefile.inc')
| -rw-r--r-- | payloads/libpayload/arch/armv7/Makefile.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/payloads/libpayload/arch/armv7/Makefile.inc b/payloads/libpayload/arch/armv7/Makefile.inc index 2c7c9e9cc3..a27fdd4b0a 100644 --- a/payloads/libpayload/arch/armv7/Makefile.inc +++ b/payloads/libpayload/arch/armv7/Makefile.inc @@ -36,3 +36,4 @@ libc-y += virtual.c libc-y += memcpy.S memset.S libc-y += exception_asm.S exception.c libc-y += cache.c +libcbfs-$(CONFIG_CBFS) += dummy_media.c |