[PATCH] RISC-V: unbreak built-in dtb

[PATCH] RISC-V: unbreak built-in dtb

[Antony Pavlov]

The commit c5d38e92010174 ("lds: Add and use RO_DATA_SECTION macro")
consolidates all RO sections link script declaration in the single
RO_DATA_SECTION macro. So all all individual RO section declarations
have to be removed from per-arch linker scripts.

Alas the BAREBOX_CLK_TABLE and the BAREBOX_DTB link script sections
were not removed from RISC-V linker script making these sections
declared twice. As a result incorrect __clk_of_table_start and
__dtb_start addresses are passed to the barebox code therefore
the RISC-V barebox is completely unusable.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/riscv/lib/barebox.lds.S | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/riscv/lib/barebox.lds.S b/arch/riscv/lib/barebox.lds.S
index 5149f8ce28..342769890b 100644
--- a/arch/riscv/lib/barebox.lds.S
+++ b/arch/riscv/lib/barebox.lds.S
@@ -48,10 +48,6 @@ SECTIONS
 
 	.rela.dyn : { *(.rela*) }
 
-	.oftables : { BAREBOX_CLK_TABLE }
-
-	.dtb : { BAREBOX_DTB }
-
 	_edata = .;
 	. = ALIGN(8);
 	__bss_start = .;
-- 
2.25.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] RISC-V: unbreak built-in dtb

[Sascha Hauer]

On Mon, Feb 03, 2020 at 09:53:41AM +0300, Antony Pavlov wrote:
> The commit c5d38e92010174 ("lds: Add and use RO_DATA_SECTION macro")
> consolidates all RO sections link script declaration in the single
> RO_DATA_SECTION macro. So all all individual RO section declarations
> have to be removed from per-arch linker scripts.
> 
> Alas the BAREBOX_CLK_TABLE and the BAREBOX_DTB link script sections
> were not removed from RISC-V linker script making these sections
> declared twice. As a result incorrect __clk_of_table_start and
> __dtb_start addresses are passed to the barebox code therefore
> the RISC-V barebox is completely unusable.
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  arch/riscv/lib/barebox.lds.S | 4 ----
>  1 file changed, 4 deletions(-)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox