| Message ID | 20230413062008.981238-8-bmeng@tinylab.org |
|---|---|
| State | Accepted |
| Commit | 3f37baae83ed7f4879b06cf41214a647228fc72b |
| Delegated to: | Andes |
| Headers | show |
| Series | [v2,1/9] riscv: Optimize source end address calculation in start.S | expand |
On Thu, Apr 13, 2023 at 02:20:07PM +0800, Bin Meng wrote: > U-Boot SPL is not relocable. Drop these relocation sections. > > Signed-off-by: Bin Meng <bmeng@tinylab.org> > > --- > > Changes in v2: > - fix SPL build error > > arch/riscv/cpu/start.S | 2 ++ > arch/riscv/cpu/u-boot-spl.lds | 25 ------------------------- > 2 files changed, 2 insertions(+), 25 deletions(-) Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 8cf25bb14a..dad22bfea8 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -253,6 +253,7 @@ spl_call_board_init_r: j board_init_r #endif +#if !defined(CONFIG_SPL_BUILD) /* * void relocate_code(addr_sp, gd, addr_moni) * @@ -400,6 +401,7 @@ call_board_init_r: * jump to it ... */ jr t4 /* jump to board_init_r() */ +#endif /* !defined(CONFIG_SPL_BUILD) */ #if CONFIG_IS_ENABLED(SMP) hart_out_of_bounds_loop: diff --git a/arch/riscv/cpu/u-boot-spl.lds b/arch/riscv/cpu/u-boot-spl.lds index 993536302a..c3b4907905 100644 --- a/arch/riscv/cpu/u-boot-spl.lds +++ b/arch/riscv/cpu/u-boot-spl.lds @@ -32,14 +32,6 @@ SECTIONS } > .spl_mem . = ALIGN(4); - .got : { - __got_start = .; - *(.got.plt) *(.got) - __got_end = .; - } > .spl_mem - - . = ALIGN(4); - __u_boot_list : { KEEP(*(SORT(__u_boot_list*))); } > .spl_mem @@ -54,23 +46,6 @@ SECTIONS . = ALIGN(4); - /DISCARD/ : { *(.rela.plt*) } - .rela.dyn : { - __rel_dyn_start = .; - *(.rela*) - __rel_dyn_end = .; - } > .spl_mem - - . = ALIGN(4); - - .dynsym : { - __dyn_sym_start = .; - *(.dynsym) - __dyn_sym_end = .; - } > .spl_mem - - . = ALIGN(4); - _end = .; _image_binary_end = .;
U-Boot SPL is not relocable. Drop these relocation sections. Signed-off-by: Bin Meng <bmeng@tinylab.org> --- Changes in v2: - fix SPL build error arch/riscv/cpu/start.S | 2 ++ arch/riscv/cpu/u-boot-spl.lds | 25 ------------------------- 2 files changed, 2 insertions(+), 25 deletions(-)