summaryrefslogtreecommitdiff
path: root/util/cbfstool/rmodule.c
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-09-05 12:59:26 -0500
committerAaron Durbin <adurbin@chromium.org>2015-09-09 19:35:30 +0000
commitdde7629e9cccf7b3a9b2e468ac8439f91d13cf97 (patch)
treef855ce91134e77665b4019efbaaee019dc36c774 /util/cbfstool/rmodule.c
parente5bad5cd3d828eba06f1db66f43948f966e7b0e0 (diff)
downloadcoreboot-dde7629e9cccf7b3a9b2e468ac8439f91d13cf97.tar.xz
rmodule: use program.ld for linking
Bring rmodule linking into the common linking method. The __rmodule_entry symbol was removed while using a more common _start symbol. The rmodtool will honor the entry point found within the ELF header. Add ENV_RMODULE so that one can distinguish the environment when generating linker scripts for rmodules. Lastly, directly use program.ld for the rmodule.ld linker script. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built rambi and analyzed the relocatable ramstage, sipi_vector, and smm rmodules. Change-Id: Iaa499eb229d8171272add9ee6d27cff75e7534ac Signed-off-by: Aaron Durbin <adubin@chromium.org> Reviewed-on: http://review.coreboot.org/11517 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/cbfstool/rmodule.c')
-rw-r--r--util/cbfstool/rmodule.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index f93f4f6508..c35eff7c17 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -402,11 +402,11 @@ static int populate_program_info(struct rmod_context *ctx)
break;
}
- if (populate_sym(ctx, "_module_params_begin", &ctx->parameters_begin,
+ if (populate_sym(ctx, "_rmodule_params", &ctx->parameters_begin,
nsyms, strtab))
return -1;
- if (populate_sym(ctx, "_module_params_end", &ctx->parameters_end,
+ if (populate_sym(ctx, "_ermodule_params", &ctx->parameters_end,
nsyms, strtab))
return -1;
@@ -416,8 +416,8 @@ static int populate_program_info(struct rmod_context *ctx)
if (populate_sym(ctx, "_ebss", &ctx->bss_end, nsyms, strtab))
return -1;
- if (populate_sym(ctx, "__rmodule_entry", &ctx->entry, nsyms, strtab))
- return -1;
+ /* Honor the entry point within the ELF header. */
+ ctx->entry = ehdr->e_entry;
/* Link address is the virtual address of the program segment. */
ctx->link_addr = ctx->phdr->p_vaddr;