summaryrefslogtreecommitdiff
path: root/src/vendorcode
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-05-20 12:08:55 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-06-02 14:10:08 +0200
commitac12c66cf91343153ea90a6f33977a13e10b21d0 (patch)
tree2864de25bb12ed2d5c7ec8d691ec753f146c5e57 /src/vendorcode
parent6a452eff90411176f9f2cad0ca0c665a31c032ee (diff)
downloadcoreboot-ac12c66cf91343153ea90a6f33977a13e10b21d0.tar.xz
assets: abstract away the firmware assets used for booting
As there can be more than one source of firmware assets this patch generalizes the notion of locating a particular asset. struct asset is added along with some helper functions for working on assets as a first class citizen. Change-Id: I2ce575d1e5259aed4c34c3dcfd438abe9db1d7b9 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/10264 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/vendorcode')
-rw-r--r--src/vendorcode/google/chromeos/vboot2/vboot_loader.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
index 5248305a04..cbb5f89bc0 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
@@ -17,10 +17,10 @@
* Foundation, Inc.
*/
+#include <assets.h>
#include <cbfs.h>
#include <cbmem.h>
#include <console/console.h>
-#include <program_loading.h>
#include <rmodule.h>
#include <rules.h>
#include <string.h>
@@ -79,7 +79,7 @@ static void init_vb2_working_data(void)
wd->buffer_size = work_size - wd->buffer_offset;
}
-static int vboot_loader_active(struct prog *prog)
+static int vboot_active(struct asset *asset)
{
struct vb2_working_data *wd;
int run_verification;
@@ -90,15 +90,15 @@ static int vboot_loader_active(struct prog *prog)
init_vb2_working_data();
verstage_main();
} else if (verstage_should_load()) {
- struct prog verstage = {
- .type = PROG_VERSTAGE,
- .name = CONFIG_CBFS_PREFIX "/verstage",
- };
+ struct prog verstage =
+ PROG_INIT(ASSET_VERSTAGE,
+ CONFIG_CBFS_PREFIX "/verstage");
printk(BIOS_DEBUG, "VBOOT: Loading verstage.\n");
/* load verstage from RO */
- if (cbfs_boot_locate(&verstage.rdev, verstage.name, NULL) ||
+ if (cbfs_boot_locate(prog_rdev(&verstage),
+ prog_name(&verstage), NULL) ||
cbfs_prog_stage_load(&verstage))
die("failed to load verstage");
@@ -126,24 +126,24 @@ static int vboot_loader_active(struct prog *prog)
}
static int vboot_locate_by_components(const struct region_device *fw_main,
- struct prog *prog)
+ struct asset *asset)
{
struct vboot_components *fw_info;
size_t metadata_sz;
size_t offset;
size_t size;
- struct region_device *fw = &prog->rdev;
+ struct region_device *fw = asset_rdev(asset);
int fw_index = 0;
- if (prog->type == PROG_ROMSTAGE)
+ if (asset_type(asset) == ASSET_ROMSTAGE)
fw_index = CONFIG_VBOOT_ROMSTAGE_INDEX;
- else if (prog->type == PROG_RAMSTAGE)
+ else if (asset_type(asset) == ASSET_RAMSTAGE)
fw_index = CONFIG_VBOOT_RAMSTAGE_INDEX;
- else if (prog->type == PROG_PAYLOAD)
+ else if (asset_type(asset) == ASSET_PAYLOAD)
fw_index = CONFIG_VBOOT_BOOT_LOADER_INDEX;
- else if (prog->type == PROG_REFCODE)
+ else if (asset_type(asset) == ASSET_REFCODE)
fw_index = CONFIG_VBOOT_REFCODE_INDEX;
- else if (prog->type == PROG_BL31)
+ else if (asset_type(asset) == ASSET_BL31)
fw_index = CONFIG_VBOOT_BL31_INDEX;
else
die("Invalid program type for vboot.");
@@ -177,7 +177,7 @@ static int vboot_locate_by_components(const struct region_device *fw_main,
}
static int vboot_locate_by_multi_cbfs(const struct region_device *fw_main,
- struct prog *prog)
+ struct asset *asset)
{
struct cbfsd cbfs;
struct region_device rdev;
@@ -192,21 +192,21 @@ static int vboot_locate_by_multi_cbfs(const struct region_device *fw_main,
cbfs.rdev = &rdev;
cbfs.align = props.align;
- return cbfs_locate(&prog->rdev, &cbfs, prog->name, NULL);
+ return cbfs_locate(asset_rdev(asset), &cbfs, asset_name(asset), NULL);
}
-static int vboot_prog_locate(const struct region_device *fw_main,
- struct prog *prog)
+static int vboot_asset_locate(const struct region_device *fw_main,
+ struct asset *asset)
{
if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES))
- return vboot_locate_by_multi_cbfs(fw_main, prog);
+ return vboot_locate_by_multi_cbfs(fw_main, asset);
else
- return vboot_locate_by_components(fw_main, prog);
+ return vboot_locate_by_components(fw_main, asset);
}
-/* This function is only called when vboot_loader_active() returns 1. That
+/* This function is only called when vboot_active() returns 1. That
* means we are taking vboot paths. */
-static int vboot_locate(struct prog *prog)
+static int vboot_locate(struct asset *asset)
{
struct vb2_working_data *wd;
struct region_device fw_main;
@@ -221,11 +221,11 @@ static int vboot_locate(struct prog *prog)
if (vb2_get_selected_region(wd, &fw_main))
die("failed to reference selected region\n");
- return vboot_prog_locate(&fw_main, prog);
+ return vboot_asset_locate(&fw_main, asset);
}
-const struct prog_loader_ops vboot_loader = {
+const struct asset_provider vboot_provider = {
.name = "VBOOT",
- .is_loader_active = vboot_loader_active,
+ .is_active = vboot_active,
.locate = vboot_locate,
};