Patch merged into coreboot/master: 82683ab libpayload: provide missing cbfs symbol

the following patch was just integrated into master:
commit 82683ab9d4435d46d4d61cf58de32d405cbda84f
Author: Aaron Durbin 
Date:   Tue May 28 09:25:32 2013 -0500

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 
    Reviewed-on: https://gerrit.chromium.org/gerrit/56805
    Reviewed-by: Duncan Laurie 
    (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 
    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 
    Reviewed-on: http://review.coreboot.org/6411
    Tested-by: build bot (Jenkins)
    Reviewed-by: Edward O'Callaghan

See http://review.coreboot.org/6411 for details.

-gerrit