Hi, On 03/28/2014 12:57 PM, Olliver Schinagl wrote: > On 03/27/2014 11:05 PM, Ian Campbell wrote: >> This makes the script somewhat more conformant to the upstream coding style >> using in other linker scripts. >> >> Add a license header at the same time. >> >> Signed-off-by: Ian Campbell <[email protected]> >> Cc: Henrik Nordstrom <[email protected]> >> --- >> Henrik, I added a license header here since one was missing, since you >> authored >> the file please could you confirm it is correct and if so add your S-o-b, >> thanks. > I have it applied locally, and queued up with the other patches you sent + > jemk's dram patch. If henrik gives his SoB; i'll push them all to sunxi-u-boot
I've already pushed all 5 Ian's cleanup patches. I missed this comment about the copyright stuff. If hno objects we can always revert that bit. As for pushing jemk's dram patch I've tested it on the boards we discussed and it works fine for me. Regards, Hans > > I've tested the dram patch on 2 boards, and hansg tested them on 3 other > boards. > > Olliver >> --- >> arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds | 124 >> ++++++++++++++++------------ >> 1 file changed, 71 insertions(+), 53 deletions(-) >> >> diff --git a/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds >> b/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds >> index cf02300..364e35c 100644 >> --- a/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds >> +++ b/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds >> @@ -1,59 +1,77 @@ >> +/* >> + * (C) Copyright 2013 >> + * Henrik Nordstrom <[email protected]> >> + * >> + * SPDX-License-Identifier: GPL-2.0+ >> + */ >> OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") >> OUTPUT_ARCH(arm) >> ENTRY(s_init) >> SECTIONS >> { >> - . = 0x00002000; >> - . = ALIGN(4); >> - .text : >> - { >> - *(.text.s_init) >> - *(.text*) >> - } >> - . = ALIGN(4); >> - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } >> - . = ALIGN(4); >> - .data : { >> - *(.data*) >> - } >> - . = ALIGN(4); >> - . = .; >> - . = ALIGN(4); >> - .rel.dyn : { >> - __rel_dyn_start = .; >> - *(.rel*) >> - __rel_dyn_end = .; >> - } >> - .dynsym : { >> - __dynsym_start = .; >> - *(.dynsym) >> - } >> - . = ALIGN(4); >> - .note.gnu.build-id : >> - { >> - *(.note.gnu.build-id) >> - } >> - _end = .; >> - . = ALIGN(4096); >> - .mmutable : { >> - *(.mmutable) >> - } >> - .bss_start __rel_dyn_start (OVERLAY) : { >> - KEEP(*(.__bss_start)); >> - __bss_base = .; >> - } >> - .bss __bss_base (OVERLAY) : { >> - *(.bss*) >> - . = ALIGN(4); >> - __bss_limit = .; >> - } >> - .bss_end __bss_limit (OVERLAY) : { >> - KEEP(*(.__bss_end)); >> - } >> - /DISCARD/ : { *(.dynstr*) } >> - /DISCARD/ : { *(.dynamic*) } >> - /DISCARD/ : { *(.plt*) } >> - /DISCARD/ : { *(.interp*) } >> - /DISCARD/ : { *(.gnu*) } >> - /DISCARD/ : { *(.note*) } >> + . = 0x00002000; >> + >> + . = ALIGN(4); >> + .text : >> + { >> + *(.text.s_init) >> + *(.text*) >> + } >> + >> + . = ALIGN(4); >> + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } >> + >> + . = ALIGN(4); >> + .data : { >> + *(.data*) >> + } >> + >> + . = ALIGN(4); >> + . = .; >> + >> + . = ALIGN(4); >> + .rel.dyn : { >> + __rel_dyn_start = .; >> + *(.rel*) >> + __rel_dyn_end = .; >> + } >> + >> + .dynsym : { >> + __dynsym_start = .; >> + *(.dynsym) >> + } >> + >> + . = ALIGN(4); >> + .note.gnu.build-id : >> + { >> + *(.note.gnu.build-id) >> + } >> + _end = .; >> + >> + . = ALIGN(4096); >> + .mmutable : { >> + *(.mmutable) >> + } >> + >> + .bss_start __rel_dyn_start (OVERLAY) : { >> + KEEP(*(.__bss_start)); >> + __bss_base = .; >> + } >> + >> + .bss __bss_base (OVERLAY) : { >> + *(.bss*) >> + . = ALIGN(4); >> + __bss_limit = .; >> + } >> + >> + .bss_end __bss_limit (OVERLAY) : { >> + KEEP(*(.__bss_end)); >> + } >> + >> + /DISCARD/ : { *(.dynstr*) } >> + /DISCARD/ : { *(.dynamic*) } >> + /DISCARD/ : { *(.plt*) } >> + /DISCARD/ : { *(.interp*) } >> + /DISCARD/ : { *(.gnu*) } >> + /DISCARD/ : { *(.note*) } >> } >> > -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
