diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-09-05 12:59:26 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-09-09 19:35:30 +0000 |
| commit | dde7629e9cccf7b3a9b2e468ac8439f91d13cf97 (patch) | |
| tree | f855ce91134e77665b4019efbaaee019dc36c774 /src/arch/x86 | |
| parent | e5bad5cd3d828eba06f1db66f43948f966e7b0e0 (diff) | |
| download | coreboot-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 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/c_start.S | 2 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/header.ld | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/arch/x86/c_start.S b/src/arch/x86/c_start.S index 582966bfdc..ad4589acc1 100644 --- a/src/arch/x86/c_start.S +++ b/src/arch/x86/c_start.S @@ -23,8 +23,6 @@ thread_stacks: .code32 #endif .globl _start - .globl __rmodule_entry -__rmodule_entry: _start: cli lgdt %cs:gdtaddr diff --git a/src/arch/x86/include/arch/header.ld b/src/arch/x86/include/arch/header.ld index 55547adcd4..0262c9208d 100644 --- a/src/arch/x86/include/arch/header.ld +++ b/src/arch/x86/include/arch/header.ld @@ -24,7 +24,7 @@ PHDRS to_load PT_LOAD; } -#if ENV_RAMSTAGE +#if ENV_RAMSTAGE || ENV_RMODULE ENTRY(_start) #elif ENV_ROMSTAGE ENTRY(protected_start) |