[PATCH 4/4] lds: the RO_DATA_SECTION macro does not work on my SAMA5D3 board

[Peter Rosin]

This is a partial revert of patch
c5d38e9201 ("lds: Add and use RO_DATA_SECTION macro")
after adjusting to further changes made by
cd23b6facf ("common: add initial barebox deep-probe support")

Signed-off-by: Peter Rosin <peda at axentia.se>
---
 arch/arm/lib32/barebox.lds.S | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/arch/arm/lib32/barebox.lds.S b/arch/arm/lib32/barebox.lds.S
index 77a5c525c5ae..0106026f13ca 100644
--- a/arch/arm/lib32/barebox.lds.S
+++ b/arch/arm/lib32/barebox.lds.S
@@ -38,10 +38,7 @@ SECTIONS
 	BAREBOX_BARE_INIT_SIZE
 
 	. = ALIGN(4);
-	.rodata : {
-		*(.rodata*)
-		RO_DATA_SECTION
-	}
+	.rodata : { *(.rodata*) }
 
 #ifdef CONFIG_ARM_UNWIND
 	/*
@@ -70,6 +67,16 @@ SECTIONS
 	.barebox_imd : { BAREBOX_IMD }
 
 	. = .;
+	.barebox_cmd : { BAREBOX_CMDS }
+	.barebox_ratp_cmd : { BAREBOX_RATP_CMDS }
+	.barebox_magicvar : { BAREBOX_MAGICVARS }
+	.barebox_initcalls : { BAREBOX_INITCALLS }
+	.barebox_exitcalls : { BAREBOX_EXITCALLS }
+	__usymtab : { BAREBOX_SYMS }
+	.pci_fixup : { BAREBOX_PCI_FIXUP }
+	.oftables : { BAREBOX_CLK_TABLE }
+	.dtb : { BAREBOX_DTB }
+	.deep_probe : { BAREBOX_DEEP_PROBE }
 
 	.rel_dyn_start : { *(.__rel_dyn_start) }
 	.rel.dyn : { *(.rel*) }
-- 
2.20.1