summaryrefslogtreecommitdiff
path: root/src/lib/prog_loaders.c
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-12-08 14:34:35 -0600
committerAaron Durbin <adurbin@chromium.org>2015-12-10 04:44:09 +0100
commit7e7a4df58075fdff4293d2203b035b970d21aeb8 (patch)
tree5897c05b07adaa7d12f747a49dc3f513d2dc2d9e /src/lib/prog_loaders.c
parent6d720f38e06d14cc8a89635f66dc124dcd5ac150 (diff)
downloadcoreboot-7e7a4df58075fdff4293d2203b035b970d21aeb8.tar.xz
lib: remove assets infrastructure
Now that only CBFS access is supported for finding resources within the boot media the assets infrastructure can be removed. Remove it. BUG=chromium:445938 BRANCH=None TEST=Built and ran on glados. Change-Id: I383fd6579280cf9cfe5a18c2851baf74cad004e9 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/12690 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/lib/prog_loaders.c')
-rw-r--r--src/lib/prog_loaders.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index e27eca1f3a..3f5d95ca6c 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -50,7 +50,7 @@ int prog_locate(struct prog *prog)
void run_romstage(void)
{
struct prog romstage =
- PROG_INIT(ASSET_ROMSTAGE, CONFIG_CBFS_PREFIX "/romstage");
+ PROG_INIT(PROG_ROMSTAGE, CONFIG_CBFS_PREFIX "/romstage");
if (prog_locate(&romstage))
goto fail;
@@ -104,7 +104,7 @@ static int load_relocatable_ramstage(struct prog *ramstage)
void run_ramstage(void)
{
struct prog ramstage =
- PROG_INIT(ASSET_RAMSTAGE, CONFIG_CBFS_PREFIX "/ramstage");
+ PROG_INIT(PROG_RAMSTAGE, CONFIG_CBFS_PREFIX "/ramstage");
timestamp_add_now(TS_END_ROMSTAGE);
@@ -137,7 +137,7 @@ fail:
#ifdef __RAMSTAGE__ // gc-sections should take care of this
static struct prog global_payload =
- PROG_INIT(ASSET_PAYLOAD, CONFIG_CBFS_PREFIX "/payload");
+ PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/payload");
void __attribute__((weak)) mirror_payload(struct prog *payload)
{