fpga_compress: interleave (combine) fpga_lf.bit and fpga_hf.bit before compression.

[proxmark3-svn] / armsrc / ldscript

diff --git a/armsrc/ldscript b/armsrc/ldscript
index f35fc5fe27d8e95e1cb901b277a76607a2d07dff..6175564dceff930950c4b272d3b60536cc1cbda2 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,10 +19,6 @@ PHDRS
 ENTRY(Vector)
 SECTIONS
 {
-       .fpgaimage : {
-               *(fpga_bit.data)
-       } >fpgaimage :fpgaimage
-
        .start : {
                *(.startos)
        } >osimage :text
@@ -38,8 +33,9 @@ SECTIONS
 
        .rodata : {
                *(.rodata)
-               *(.rodata*)
-               *(.version_information)
+               *(.rodata.*)
+               *(fpga_all_bit.data)
+               KEEP(*(.version_information))
        } >osimage :text
 
        . = ALIGN(4);
@@ -47,12 +43,14 @@ SECTIONS
        .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__ = .; 
@@ -60,7 +58,7 @@ SECTIONS
                *(.bss.*) 
                . = ALIGN(4);
                __bss_end__ = .;
-       } >ram :bss
+       } >ram AT>ram :bss
 
        .commonarea (NOLOAD) : {
                *(.commonarea)