Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / armsrc / ldscript

diff --git a/armsrc/ldscript b/armsrc/ldscript
index 70be53b5436053d667ce4d7b13d249b4f4c5fac9..840b819643dcb21e49b7fc4159f138706e142fb6 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,10 +19,6 @@ PHDRS
 ENTRY(Vector)
 SECTIONS
 {
 ENTRY(Vector)
 SECTIONS
 {

-       .fpgaimage : {
-               *(fpga_bit.data)
-       } >fpgaimage :fpgaimage
-

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


@@ -39,6 +34,8 @@ SECTIONS
        .rodata : {
                *(.rodata)
                *(.rodata.*)
        .rodata : {
                *(.rodata)
                *(.rodata.*)

+               *(fpga_lf_bit.data)
+               *(fpga_hf_bit.data)

                KEEP(*(.version_information))
        } >osimage :text
 
                KEEP(*(.version_information))
        } >osimage :text
 


@@ -47,6 +44,7 @@ SECTIONS
        .data : {
                *(.data)
                *(.data.*)
        .data : {
                *(.data)
                *(.data.*)

+               *(.ramfunc)

                . = ALIGN(4);
        } >ram AT>osimage :data
 
                . = ALIGN(4);
        } >ram AT>osimage :data