diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:25 +0200 |
| commit | e66acf22a48a8163292eae03bca9baac874905bc (patch) | |
| tree | 16cbd12d66b6c85637be89a2939306a4c9406ccb /arch/arm | |
| parent | 9156b904baf981561a8ed486db52746b04d2e464 (diff) | |
| parent | 9341918ba869bcbdd1b9147d1ae85f1f27440557 (diff) | |
| download | barebox-e66acf22a48a8163292eae03bca9baac874905bc.tar.gz barebox-e66acf22a48a8163292eae03bca9baac874905bc.tar.xz | |
Merge branch 'for-next/rsa'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/lib32/barebox.lds.S | 44 | ||||
| -rw-r--r-- | arch/arm/lib64/barebox.lds.S | 46 |
2 files changed, 8 insertions, 82 deletions
diff --git a/arch/arm/lib32/barebox.lds.S b/arch/arm/lib32/barebox.lds.S index 7230e5f31f..c479e02e91 100644 --- a/arch/arm/lib32/barebox.lds.S +++ b/arch/arm/lib32/barebox.lds.S @@ -55,7 +55,10 @@ SECTIONS BAREBOX_BARE_INIT_SIZE . = ALIGN(4); - .rodata : { *(.rodata*) } + .rodata : { + *(.rodata*) + RO_DATA_SECTION + } #ifdef CONFIG_ARM_UNWIND /* @@ -82,45 +85,6 @@ SECTIONS .barebox_imd : { BAREBOX_IMD } . = .; - __barebox_cmd_start = .; - .barebox_cmd : { BAREBOX_CMDS } - __barebox_cmd_end = .; - - __barebox_ratp_cmd_start = .; - .barebox_ratp_cmd : { BAREBOX_RATP_CMDS } - __barebox_ratp_cmd_end = .; - - __barebox_magicvar_start = .; - .barebox_magicvar : { BAREBOX_MAGICVARS } - __barebox_magicvar_end = .; - - __barebox_initcalls_start = .; - .barebox_initcalls : { INITCALLS } - __barebox_initcalls_end = .; - - __barebox_exitcalls_start = .; - .barebox_exitcalls : { EXITCALLS } - __barebox_exitcalls_end = .; - - __usymtab_start = .; - __usymtab : { BAREBOX_SYMS } - __usymtab_end = .; - -#ifdef CONFIG_PCI - __start_pci_fixups_early = .; - .pci_fixup_early : { KEEP(*(.pci_fixup_early)) } - __end_pci_fixups_early = .; - __start_pci_fixups_header = .; - .pci_fixup_header : { KEEP(*(.pci_fixup_header)) } - __end_pci_fixups_header = .; - __start_pci_fixups_enable = .; - .pci_fixup_enable : { KEEP(*(.pci_fixup_enable)) } - __end_pci_fixups_enable = .; -#endif - - .oftables : { BAREBOX_CLK_TABLE() } - - .dtb : { BAREBOX_DTB() } .rel_dyn_start : { *(.__rel_dyn_start) } .rel.dyn : { *(.rel*) } diff --git a/arch/arm/lib64/barebox.lds.S b/arch/arm/lib64/barebox.lds.S index 694bbcaaf1..cf6ef18895 100644 --- a/arch/arm/lib64/barebox.lds.S +++ b/arch/arm/lib64/barebox.lds.S @@ -53,7 +53,10 @@ SECTIONS BAREBOX_BARE_INIT_SIZE . = ALIGN(4); - .rodata : { *(.rodata*) } + .rodata : { + *(.rodata*) + RO_DATA_SECTION + } _etext = .; /* End of text and rodata section */ _sdata = .; @@ -63,47 +66,6 @@ SECTIONS .barebox_imd : { BAREBOX_IMD } - . = .; - __barebox_cmd_start = .; - .barebox_cmd : { BAREBOX_CMDS } - __barebox_cmd_end = .; - - __barebox_ratp_cmd_start = .; - .barebox_ratp_cmd : { BAREBOX_RATP_CMDS } - __barebox_ratp_cmd_end = .; - - __barebox_magicvar_start = .; - .barebox_magicvar : { BAREBOX_MAGICVARS } - __barebox_magicvar_end = .; - - __barebox_initcalls_start = .; - .barebox_initcalls : { INITCALLS } - __barebox_initcalls_end = .; - - __barebox_exitcalls_start = .; - .barebox_exitcalls : { EXITCALLS } - __barebox_exitcalls_end = .; - - __usymtab_start = .; - __usymtab : { BAREBOX_SYMS } - __usymtab_end = .; - -#ifdef CONFIG_PCI - __start_pci_fixups_early = .; - .pci_fixup_early : { KEEP(*(.pci_fixup_early)) } - __end_pci_fixups_early = .; - __start_pci_fixups_header = .; - .pci_fixup_header : { KEEP(*(.pci_fixup_header)) } - __end_pci_fixups_header = .; - __start_pci_fixups_enable = .; - .pci_fixup_enable : { KEEP(*(.pci_fixup_enable)) } - __end_pci_fixups_enable = .; -#endif - - .oftables : { BAREBOX_CLK_TABLE() } - - .dtb : { BAREBOX_DTB() } - .rel_dyn_start : { *(.__rel_dyn_start) } .rela.dyn : { *(.rela*) } .rel_dyn_end : { *(.__rel_dyn_end) } |