diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-27 09:39:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-27 09:39:58 -0400 |
| commit | 580eb31199be8a822e62f20965854a242f895d03 (patch) | |
| tree | d18d6192b5d60e176e98fd2acefbfb580d5bcf1e | |
| parent | 4f1077bc35f683985ff77e442ada7e8a8a52e3b7 (diff) | |
| parent | 4a3efd71cd858b87527e9478ff51529d39329819 (diff) | |
| download | u-boot-WIP/27Jun2023.zip u-boot-WIP/27Jun2023.tar.gz u-boot-WIP/27Jun2023.tar.bz2 | |
Merge branch 'riscv-fixes' of https://source.denx.de/u-boot/custodians/u-boot-riscvWIP/27Jun2023
| -rw-r--r-- | arch/riscv/cpu/u-boot.lds | 4 | ||||
| -rw-r--r-- | board/sifive/unmatched/MAINTAINERS | 1 | ||||
| -rw-r--r-- | board/starfive/visionfive2/MAINTAINERS | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/riscv/cpu/u-boot.lds b/arch/riscv/cpu/u-boot.lds index 15b5cbc..2ffe6ba 100644 --- a/arch/riscv/cpu/u-boot.lds +++ b/arch/riscv/cpu/u-boot.lds @@ -48,7 +48,7 @@ SECTIONS KEEP(*(SORT(__u_boot_list*))); } - . = ALIGN(4); + . = ALIGN(8); .efi_runtime_rel : { __efi_runtime_rel_start = .; @@ -57,8 +57,6 @@ SECTIONS __efi_runtime_rel_stop = .; } - . = ALIGN(8); - /DISCARD/ : { *(.rela.plt*) } .rela.dyn : { __rel_dyn_start = .; diff --git a/board/sifive/unmatched/MAINTAINERS b/board/sifive/unmatched/MAINTAINERS index 94c9510..e601a0f 100644 --- a/board/sifive/unmatched/MAINTAINERS +++ b/board/sifive/unmatched/MAINTAINERS @@ -1,6 +1,5 @@ SiFive HiFive Unmatched FU740 BOARD M: Paul Walmsley <paul.walmsley@sifive.com> -M: Pragnesh Patel <pragnesh.patel@sifive.com> M: Green Wan <green.wan@sifive.com> S: Maintained F: board/sifive/unmatched/ diff --git a/board/starfive/visionfive2/MAINTAINERS b/board/starfive/visionfive2/MAINTAINERS index c536908..600ff95 100644 --- a/board/starfive/visionfive2/MAINTAINERS +++ b/board/starfive/visionfive2/MAINTAINERS @@ -1,5 +1,5 @@ STARFIVE JH7110 VISIONFIVE2 BOARD -M: startfive +M: Yanhong Wang <yanhong.wang@starfivetech.com> S: Maintained F: arch/riscv/include/asm/arch-jh7110/ F: board/starfive/visionfive2/ |