summaryrefslogtreecommitdiff
path: root/src/lib/rmodule.c
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-03-27 21:17:22 -0500
committerAaron Durbin <adurbin@google.com>2015-04-03 14:53:35 +0200
commit460703bbb4f1a51b9ecd19ac78ec62c97502a4a2 (patch)
tree050712ccf718a467ee9c76b01b21dfafcb05f8a7 /src/lib/rmodule.c
parentce9efe061a23bc3e3d2a4c17cf29692ce6f9eb53 (diff)
downloadcoreboot-460703bbb4f1a51b9ecd19ac78ec62c97502a4a2.tar.xz
rmodule: use struct prog while loading rmodules
The rmod_stage_load structure contained the same fields as struct prog. In order to more closely integrate with the rest of program loading use struct prog. Change-Id: Ib7f45d0b3573e6d518864deacc4002802b11aa9c Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9143 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/lib/rmodule.c')
-rw-r--r--src/lib/rmodule.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index d06409f490..d7dc969805 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -261,7 +261,7 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage)
int load_offset;
const struct cbmem_entry *cbmem_entry;
- if (stage == NULL || rsl->name == NULL)
+ if (stage == NULL || rsl->prog == NULL || rsl->prog->name == NULL)
return -1;
rmodule_offset =
@@ -276,7 +276,7 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage)
stage_region = cbmem_entry_start(cbmem_entry);
printk(BIOS_INFO, "Decompressing stage %s @ 0x%p (%d bytes)\n",
- rsl->name, &stage_region[rmodule_offset], stage->memlen);
+ rsl->prog->name, &stage_region[rmodule_offset], stage->memlen);
if (!cbfs_decompress(stage->compression, &stage[1],
&stage_region[rmodule_offset], stage->len))
@@ -288,8 +288,8 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage)
if (rmodule_load(&stage_region[load_offset], &rmod_stage))
return -1;
- rsl->cbmem_entry = cbmem_entry;
- rsl->entry = rmodule_entry(&rmod_stage);
+ prog_set_area(rsl->prog, stage_region, cbmem_entry_size(cbmem_entry));
+ prog_set_entry(rsl->prog, rmodule_entry(&rmod_stage), NULL);
return 0;
}
@@ -299,7 +299,7 @@ int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl)
struct cbfs_stage *stage;
stage = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
- rsl->name, CBFS_TYPE_STAGE, NULL);
+ rsl->prog->name, CBFS_TYPE_STAGE, NULL);
if (stage == NULL)
return -1;