Browse Source

update the GNU GCC link script.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1283 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong 14 years ago
parent
commit
88b3199266
3 changed files with 103 additions and 94 deletions
  1. 1 1
      bsp/stm3210/SConstruct
  2. 2 3
      bsp/stm3210/rtconfig.py
  3. 100 90
      bsp/stm3210/stm32_rom.ld

+ 1 - 1
bsp/stm3210/SConstruct

@@ -26,7 +26,7 @@ Export('rtconfig')
 objs = PrepareBuilding(env, RTT_ROOT)
 
 # STM32 firemare library building script
-objs = objs + SConscript(RTT_ROOT + '/bsp/stm3210/Libraries/SConscript', variant_dir='bsp/Libraries', duplicate=0)
+objs = objs + SConscript(RTT_ROOT + '/bsp/stm3210/Libraries/SConscript', variant_dir='build/bsp/Libraries', duplicate=0)
 
 # build program 
 env.Program(TARGET, objs)

+ 2 - 3
bsp/stm3210/rtconfig.py

@@ -1,7 +1,7 @@
 # toolchains options
 ARCH='arm'
 CPU='stm32'
-CROSS_TOOL='keil'
+CROSS_TOOL='gcc'
 
 if  CROSS_TOOL == 'gcc':
 	PLATFORM 	= 'gcc'
@@ -28,7 +28,7 @@ if PLATFORM == 'gcc':
     OBJDUMP = PREFIX + 'objdump'
     OBJCPY = PREFIX + 'objcopy'
 
-    DEVICE = ' -mcpu=cortex-m3 -mthumb'
+    DEVICE = ' -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections'
     CFLAGS = DEVICE + ' -DRT_USING_MINILIBC'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
     LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-stm32.map,-cref,-u,Reset_Handler -T stm32_rom.ld'
@@ -110,7 +110,6 @@ elif PLATFORM == 'iar':
     LFLAGS = ' --config stm32f10x_flash.icf'
     LFLAGS += ' --redirect _Printf=_PrintfTiny' 
     LFLAGS += ' --redirect _Scanf=_ScanfSmall' 
-#    LFLAGS = ' --map I:\RTT\20110219\rt-thread\bsp\stm3210\Debug\List\project.map 
     LFLAGS += ' --entry __iar_program_start'    
 
     EXEC_PATH = IAR_PATH + '/arm/bin/'

+ 100 - 90
bsp/stm3210/stm32_rom.ld

@@ -6,111 +6,121 @@
 /* Program Entry, set to mark it as "used" and avoid gc */
 MEMORY
 {
-	CODE (rx) : ORIGIN = 0x08000000, LENGTH = 0x00080000
-	DATA (rw) : ORIGIN = 0x20000000, LENGTH = 0x00010000
+    CODE (rx) : ORIGIN = 0x08000000, LENGTH = 0x00080000
+    DATA (rw) : ORIGIN = 0x20000000, LENGTH = 0x00010000
 }
 ENTRY(Reset_Handler)
 
 SECTIONS
 {
-	.text :
-	{
-	. = ALIGN(4);
-	KEEP(*(.isr_vector))            /* Startup code */
-	. = ALIGN(4);
-	*(.text)						/* remaining code */
-	*(.text.*)						/* remaining code */
-	*(.rodata)						/* read-only data (constants) */
-	*(.rodata*)
-	*(.glue_7)
-	*(.glue_7t)
+    .text :
+    {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))            /* Startup code */
+        . = ALIGN(4);
+        *(.text)                        /* remaining code */
+        *(.text.*)                      /* remaining code */
+        *(.rodata)                      /* read-only data (constants) */
+        *(.rodata*)
+        *(.glue_7)
+        *(.glue_7t)
+        *(.gnu.linkonce.t*)
 
-	/* section information for finsh shell */
-	. = ALIGN(4);
-	__fsymtab_start = .;
-	KEEP(*(FSymTab))
-	__fsymtab_end = .;
-	. = ALIGN(4);
-	__vsymtab_start = .;
-	KEEP(*(VSymTab))
-	__vsymtab_end = .;
-	. = ALIGN(4);
+        /* section information for finsh shell */
+        . = ALIGN(4);
+        __fsymtab_start = .;
+        KEEP(*(FSymTab))
+        __fsymtab_end = .;
+        . = ALIGN(4);
+        __vsymtab_start = .;
+        KEEP(*(VSymTab))
+        __vsymtab_end = .;
+        . = ALIGN(4);
 
-	. = ALIGN(4);
-	_etext = .;
+        . = ALIGN(4);
+        _etext = .;
+    } > CODE = 0
 
-	/* This is used by the startup in order to initialize the .data secion */
-	_sidata = _etext;
-	} > CODE = 0
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
 
-	/* .data section which is used for initialized data */
+        /* This is used by the startup in order to initialize the .data secion */
+        _sidata = .;
+    } > CODE
+    __exidx_end = .;
 
-	.data : AT (_sidata)
-	{
-	. = ALIGN(4);
-	/* This is used by the startup in order to initialize the .data secion */
-	_sdata = . ;
+    /* .data section which is used for initialized data */
 
-	*(.data)
-	*(.data.*)
+    .data : AT (_sidata)
+    {
+        . = ALIGN(4);
+        /* This is used by the startup in order to initialize the .data secion */
+        _sdata = . ;
 
-	. = ALIGN(4);
-	/* This is used by the startup in order to initialize the .data secion */
-	_edata = . ;
-	} >DATA
+        *(.data)
+        *(.data.*)
+        *(.gnu.linkonce.d*)
 
-	__bss_start = .;
-	.bss :
-	{
-	. = ALIGN(4);
-	/* This is used by the startup in order to initialize the .bss secion */
-	_sbss = .;
+        . = ALIGN(4);
+        /* This is used by the startup in order to initialize the .data secion */
+        _edata = . ;
+    } >DATA
 
-	*(.bss)
-	*(COMMON)
+    __bss_start = .;
+    .bss :
+    {
+        . = ALIGN(4);
+        /* This is used by the startup in order to initialize the .bss secion */
+        _sbss = .;
 
-	. = ALIGN(4);
-	/* This is used by the startup in order to initialize the .bss secion */
-	_ebss = . ;
-	_estack = .;
-	
-	*(.bss.init)
-	} > DATA
-	__bss_end = .;
+        *(.bss)
+        *(COMMON)
 
-	_end = .;
+        . = ALIGN(4);
+        /* This is used by the startup in order to initialize the .bss secion */
+        _ebss = . ;
+        _estack = .;
+        
+        *(.bss.init)
+    } > DATA
+    __bss_end = .;
 
-	/* Stabs debugging sections.  */
-	.stab          0 : { *(.stab) }
-	.stabstr       0 : { *(.stabstr) }
-	.stab.excl     0 : { *(.stab.excl) }
-	.stab.exclstr  0 : { *(.stab.exclstr) }
-	.stab.index    0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment       0 : { *(.comment) }
-	/* DWARF debug sections.
-	 * Symbols in the DWARF debugging sections are relative to the beginning
-	 * of the section so we begin them at 0.  */
-	/* DWARF 1 */
-	.debug          0 : { *(.debug) }
-	.line           0 : { *(.line) }
-	/* GNU DWARF 1 extensions */
-	.debug_srcinfo  0 : { *(.debug_srcinfo) }
-	.debug_sfnames  0 : { *(.debug_sfnames) }
-	/* DWARF 1.1 and DWARF 2 */
-	.debug_aranges  0 : { *(.debug_aranges) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	/* DWARF 2 */
-	.debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-	.debug_abbrev   0 : { *(.debug_abbrev) }
-	.debug_line     0 : { *(.debug_line) }
-	.debug_frame    0 : { *(.debug_frame) }
-	.debug_str      0 : { *(.debug_str) }
-	.debug_loc      0 : { *(.debug_loc) }
-	.debug_macinfo  0 : { *(.debug_macinfo) }
-	/* SGI/MIPS DWARF 2 extensions */
-	.debug_weaknames 0 : { *(.debug_weaknames) }
-	.debug_funcnames 0 : { *(.debug_funcnames) }
-	.debug_typenames 0 : { *(.debug_typenames) }
-	.debug_varnames  0 : { *(.debug_varnames) }
+    _end = .;
+
+    /* Stabs debugging sections.  */
+    .stab          0 : { *(.stab) }
+    .stabstr       0 : { *(.stabstr) }
+    .stab.excl     0 : { *(.stab.excl) }
+    .stab.exclstr  0 : { *(.stab.exclstr) }
+    .stab.index    0 : { *(.stab.index) }
+    .stab.indexstr 0 : { *(.stab.indexstr) }
+    .comment       0 : { *(.comment) }
+    /* DWARF debug sections.
+     * Symbols in the DWARF debugging sections are relative to the beginning
+     * of the section so we begin them at 0.  */
+    /* DWARF 1 */
+    .debug          0 : { *(.debug) }
+    .line           0 : { *(.line) }
+    /* GNU DWARF 1 extensions */
+    .debug_srcinfo  0 : { *(.debug_srcinfo) }
+    .debug_sfnames  0 : { *(.debug_sfnames) }
+    /* DWARF 1.1 and DWARF 2 */
+    .debug_aranges  0 : { *(.debug_aranges) }
+    .debug_pubnames 0 : { *(.debug_pubnames) }
+    /* DWARF 2 */
+    .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+    .debug_abbrev   0 : { *(.debug_abbrev) }
+    .debug_line     0 : { *(.debug_line) }
+    .debug_frame    0 : { *(.debug_frame) }
+    .debug_str      0 : { *(.debug_str) }
+    .debug_loc      0 : { *(.debug_loc) }
+    .debug_macinfo  0 : { *(.debug_macinfo) }
+    /* SGI/MIPS DWARF 2 extensions */
+    .debug_weaknames 0 : { *(.debug_weaknames) }
+    .debug_funcnames 0 : { *(.debug_funcnames) }
+    .debug_typenames 0 : { *(.debug_typenames) }
+    .debug_varnames  0 : { *(.debug_varnames) }
 }