commit 460703bbb4f1a51b9ecd19ac78ec62c97502a4a2
author Aaron Durbin <adurbin@chromium.org> Fri Mar 27 21:17:22 2015 -0500
committer Aaron Durbin <adurbin@google.com> Fri Apr 03 14:53:35 2015 +0200
tree 050712ccf718a467ee9c76b01b21dfafcb05f8a7
parent ce9efe061a23bc3e3d2a4c17cf29692ce6f9eb53

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>

src/lib/rmodule.c

diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index d06409f..d7dc969 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -261,7 +261,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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;