aboutsummaryrefslogtreecommitdiff
path: root/arch/riscv/cpu
diff options
context:
space:
mode:
authorBin Meng <bmeng@tinylab.org>2023-04-13 14:20:07 +0800
committerLeo Yu-Chi Liang <ycliang@andestech.com>2023-04-20 20:45:08 +0800
commit3f37baae83ed7f4879b06cf41214a647228fc72b (patch)
tree1a349cd35d902f99fe38b3d43ce84cce0c62cb2d /arch/riscv/cpu
parent3c09ac2c589fbf4d0976c49956cc9c6d14c33986 (diff)
downloadu-boot-3f37baae83ed7f4879b06cf41214a647228fc72b.zip
u-boot-3f37baae83ed7f4879b06cf41214a647228fc72b.tar.gz
u-boot-3f37baae83ed7f4879b06cf41214a647228fc72b.tar.bz2
riscv: spl: Remove relocation sections
U-Boot SPL is not relocable. Drop these relocation sections. Signed-off-by: Bin Meng <bmeng@tinylab.org> Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Diffstat (limited to 'arch/riscv/cpu')
-rw-r--r--arch/riscv/cpu/start.S2
-rw-r--r--arch/riscv/cpu/u-boot-spl.lds25
2 files changed, 2 insertions, 25 deletions
diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S
index 8cf25bb..dad22bf 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 9935363..c3b4907 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 = .;