Merge branch 'master' into emv_argtable

[proxmark3-svn] / armsrc / ldscript

diff --git a/armsrc/ldscript b/armsrc/ldscript
index d0be3b6a0c25d991e0793888f8ea340cbad9fded..34da26bcdfd8cee58e6bfa99cb6bfb4c57eb59af 100644 (file)
--- a/armsrc/ldscript
+++ b/armsrc/ldscript
@@ -11,8 +11,7 @@ INCLUDE ../common/ldscript.common
 
 PHDRS
 {
 
 PHDRS
 {

-       fpgaimage PT_LOAD FLAGS(4);
-       text PT_LOAD;
+       text PT_LOAD FLAGS(5);

        data PT_LOAD;
        bss PT_LOAD;
 }
        data PT_LOAD;
        bss PT_LOAD;
 }


@@ -20,16 +19,12 @@ PHDRS
 ENTRY(Vector)
 SECTIONS
 {
 ENTRY(Vector)
 SECTIONS
 {

-       .fpgaimage : {
-               *(fpga_lf_bit.data)
-               *(fpga_hf_bit.data)
-       } >fpgaimage :fpgaimage
-

        .start : {
                *(.startos)
        } >osimage :text
 
        .text : {
        .start : {
                *(.startos)
        } >osimage :text
 
        .text : {

+               KEEP(*(stage1_image))

                *(.text)
                *(.text.*)
                *(.eh_frame)
                *(.text)
                *(.text.*)
                *(.eh_frame)


@@ -40,12 +35,13 @@ SECTIONS
        .rodata : {
                *(.rodata)
                *(.rodata.*)
        .rodata : {
                *(.rodata)
                *(.rodata.*)

+               *(fpga_all_bit.data)

                KEEP(*(.version_information))
                KEEP(*(.version_information))

+               . = ALIGN(8);

        } >osimage :text
 
        } >osimage :text
 

-       . = ALIGN(4);
-

        .data : {
        .data : {

+               KEEP(*(compressed_data))

                *(.data)
                *(.data.*)
                *(.ramfunc)
                *(.data)
                *(.data.*)
                *(.ramfunc)


@@ -55,6 +51,7 @@ SECTIONS
        __data_src_start__ = LOADADDR(.data);
        __data_start__ = ADDR(.data);
        __data_end__ = __data_start__ + SIZEOF(.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__ = .; 
        
        .bss : {
                __bss_start__ = .;