Use stack-def.h.

[gnuk/neug.git] / src / neug.ld.in

diff --git a/src/neug.ld.in b/src/neug.ld.in
index 6223752..e486c7b 100644 (file)
--- a/src/neug.ld.in
+++ b/src/neug.ld.in
@@ -1,13 +1,6 @@
 /*
  * ST32F103 memory setup.
  */
 /*
  * ST32F103 memory setup.
  */

-__main_stack_size__     = 0x0100;      /* Exception handlers     */
-__process0_stack_size__  = 0x0400;     /* main */
-__process1_stack_size__  = 0x0100;     /* led */
-__process2_stack_size__  = 0x0200;     /* rng */
-__process3_stack_size__  = 0x0100;     /* intr: usb */
-__process4_stack_size__  = 0x0100;     /* intr: adc dma */
-

 MEMORY
 {
     flash0 : org = @ORIGIN@, len = 4k
 MEMORY
 {
     flash0 : org = @ORIGIN@, len = 4k


@@ -15,10 +8,6 @@ MEMORY
     ram : org = 0x20000000, len = @MEMORY_SIZE@k
 }
 
     ram : org = 0x20000000, len = @MEMORY_SIZE@k
 }
 

-/* __flash_start__: flash ROM start address regardless of DFU_SUPPORT */
-__flash_start__         = 0x08001000;
-__flash_end__          = ORIGIN(flash) + LENGTH(flash);
-

 __ram_start__           = ORIGIN(ram);
 __ram_size__            = LENGTH(ram);
 __ram_end__             = __ram_start__ + __ram_size__;
 __ram_start__           = ORIGIN(ram);
 __ram_size__            = LENGTH(ram);
 __ram_end__             = __ram_start__ + __ram_size__;


@@ -27,16 +16,18 @@ SECTIONS
 {
     . = 0;
 
 {
     . = 0;
 

-    .sys : ALIGN(16) SUBALIGN(16)
+    .sys : ALIGN(4) SUBALIGN(4)

     {
     {

-        _sys = .;
-        KEEP(*(.vectors))
+       _sys = .;
+       KEEP(*(.vectors))

        . = ALIGN(16);
        . = ALIGN(16);

-       *(.sys.version)
-       build/sys.o(.text)
-       build/sys.o(.text.*)
-        build/sys.o(.rodata)
-       build/sys.o(.rodata.*)
+       KEEP(*(.sys.version))
+       KEEP(*(.sys.board_id))
+       KEEP(*(.sys.board_name))
+       build/sys-*.o(.text)
+       build/sys-*.o(.text.*)
+       build/sys-*.o(.rodata)
+       build/sys-*.o(.rodata.*)

        . = ALIGN(1024);
        *(.sys.0)
        *(.sys.1)
        . = ALIGN(1024);
        *(.sys.0)
        *(.sys.1)


@@ -61,6 +52,7 @@ SECTIONS
         *(.glue_7t)
         *(.glue_7)
         *(.gcc*)
         *(.glue_7t)
         *(.glue_7)
         *(.gcc*)

+       . = ALIGN(8);

     } > flash
 
     .ARM.extab : {*(.ARM.extab* .gnu.linkonce.armextab.*)} > flash
     } > flash
 
     .ARM.extab : {*(.ARM.extab* .gnu.linkonce.armextab.*)} > flash


@@ -83,31 +75,12 @@ SECTIONS
     .stacks :
     {
         . = ALIGN(8);
     .stacks :
     {
         . = ALIGN(8);

-        __process4_stack_base__ = .;
-        . += __process4_stack_size__;
-        . = ALIGN(8);
-        __process4_stack_end__ = .;
-        __process3_stack_base__ = .;
-        . += __process3_stack_size__;
-        . = ALIGN(8);
-        __process3_stack_end__ = .;
-        __process2_stack_base__ = .;
-        . += __process2_stack_size__;
-        . = ALIGN(8);
-        __process2_stack_end__ = .;
-        __process1_stack_base__ = .;
-        . += __process1_stack_size__;
+        *(.main_stack)
+        *(.process_stack.0)
+        *(.process_stack.1)
+        *(.process_stack.2)
+        *(.process_stack.3)

         . = ALIGN(8);
         . = ALIGN(8);

-        __process1_stack_end__ = .;
-        __process0_stack_base__ = .;
-        . += __process0_stack_size__;
-        . = ALIGN(8);
-        __process0_stack_end__ = .;
-        . = ALIGN(8);
-        __main_stack_base__ = .;
-        . += __main_stack_size__;
-        . = ALIGN(8);
-        __main_stack_end__ = .;

     } > ram
 
     .data :
     } > ram
 
     .data :


@@ -136,6 +109,7 @@ SECTIONS
         PROVIDE(_bss_end = .);
     } > ram
 
         PROVIDE(_bss_end = .);
     } > ram
 

+    . = ALIGN(16);

     PROVIDE(end = .);
     _end            = .;
     . = ALIGN(512);
     PROVIDE(end = .);
     _end            = .;
     . = ALIGN(512);


@@ -145,6 +119,8 @@ SECTIONS
     .fill_ffff :
     {
         . = ALIGN (@FLASH_PAGE_SIZE@);
     .fill_ffff :
     {
         . = ALIGN (@FLASH_PAGE_SIZE@);

+       *(.passwd)
+        . = ALIGN(4);

     } > flash =0xffffffff
 }
 
     } > flash =0xffffffff
 }