Fix up small error in main osc startup delay and replace more custom defines with...

[proxmark3-svn] / bootrom / ldscript-flash

diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index 5936a8fe9b40722504846f0edce15d3514464850..f1bab1494e856cc81c28299efd101350452b0f2b 100644 (file)
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -10,6 +10,13 @@
 
 INCLUDE ../common/ldscript.common
 
 
 INCLUDE ../common/ldscript.common
 

+PHDRS
+{
+       phase1 PT_LOAD;
+       phase2 PT_LOAD;
+       bss PT_LOAD;
+}
+

 ENTRY(flashstart)
 SECTIONS
 {
 ENTRY(flashstart)
 SECTIONS
 {


@@ -18,11 +25,11 @@ SECTIONS
 
                . = ALIGN(4);
                _version_information_start = .;
 
                . = ALIGN(4);
                _version_information_start = .;

-               *(.version_information);
+               KEEP(*(.version_information));

 
                . = LENGTH(bootphase1) - 0x4;
                LONG(_version_information_start);
 
                . = LENGTH(bootphase1) - 0x4;
                LONG(_version_information_start);

-       } >bootphase1
+       } >bootphase1 :phase1

 
        .bootphase2 : {
                *(.startphase2)
 
        .bootphase2 : {
                *(.startphase2)


@@ -36,7 +43,7 @@ SECTIONS
                *(.data)
                *(.data.*)
                . = ALIGN(4);
                *(.data)
                *(.data.*)
                . = ALIGN(4);

-       } >ram AT>bootphase2
+       } >ram AT>bootphase2 :phase2

 
        __bootphase2_src_start__ = LOADADDR(.bootphase2);
        __bootphase2_start__ = ADDR(.bootphase2);
 
        __bootphase2_src_start__ = LOADADDR(.bootphase2);
        __bootphase2_start__ = ADDR(.bootphase2);


@@ -48,7 +55,7 @@ SECTIONS
                *(.bss.*)
                . = ALIGN(4);
                __bss_end__ = .;
                *(.bss.*)
                . = ALIGN(4);
                __bss_end__ = .;

-       } >ram
+       } >ram AT>ram :bss

 
        .commonarea (NOLOAD) : {
                *(.commonarea)
 
        .commonarea (NOLOAD) : {
                *(.commonarea)