Merge pull request #347 from Fl0-0/master

[proxmark3-svn] / armsrc / ldscript

diff --git a/armsrc/ldscript b/armsrc/ldscript
index 70be53b5436053d667ce4d7b13d249b4f4c5fac9..34da26bcdfd8cee58e6bfa99cb6bfb4c57eb59af 100644 (file)
--- a/armsrc/ldscript
+++ b/armsrc/ldscript
@@ -11,8 +11,7 @@ INCLUDE ../common/ldscript.common
 
 PHDRS
 {
-       fpgaimage PT_LOAD FLAGS(4);
-       text PT_LOAD;
+       text PT_LOAD FLAGS(5);
        data PT_LOAD;
        bss PT_LOAD;
 }
@@ -20,15 +19,12 @@ PHDRS
 ENTRY(Vector)
 SECTIONS
 {
-       .fpgaimage : {
-               *(fpga_bit.data)
-       } >fpgaimage :fpgaimage
-
        .start : {
                *(.startos)
        } >osimage :text
 
        .text : {
+               KEEP(*(stage1_image))
                *(.text)
                *(.text.*)
                *(.eh_frame)
@@ -39,20 +35,23 @@ SECTIONS
        .rodata : {
                *(.rodata)
                *(.rodata.*)
+               *(fpga_all_bit.data)
                KEEP(*(.version_information))
+               . = ALIGN(8);
        } >osimage :text
 
-       . = ALIGN(4);
-
        .data : {
+               KEEP(*(compressed_data))
                *(.data)
                *(.data.*)
+               *(.ramfunc)
                . = ALIGN(4);
        } >ram AT>osimage :data
 
        __data_src_start__ = LOADADDR(.data);
        __data_start__ = ADDR(.data);
        __data_end__ = __data_start__ + SIZEOF(.data);
+       __os_size__ = SIZEOF(.text) + SIZEOF(.data) + SIZEOF(.rodata);
        
        .bss : {
                __bss_start__ = .;