libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[BSP] fix the compiling issue

This commit is contained in:
Bernard Xiong 2017-12-31 21:19:52 +08:00
parent 8a923193ab
commit 28e925c931
6 changed files with 243 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bsp/lm3s8962/Libraries/SConscript
View File

@ -4,7 +4,7 @@ from building import *
# The set of source files associated with this SConscript file. # The set of source files associated with this SConscript file.
cwd = GetCurrentDir() cwd = GetCurrentDir()
src = Glob('driverlib/*.c') src = Glob('driverlib/*.c')
# cortex-m3 no FPU. # cortex-m3 no FPU.
if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: if rtconfig.PART_TYPE.startswith('PART_LM4F') != True:
@ -18,9 +18,9 @@ elif rtconfig.CROSS_TOOL == 'keil':
elif rtconfig.CROSS_TOOL == 'iar': elif rtconfig.CROSS_TOOL == 'iar':
src += ['startup/iar/start_iar.S'] src += ['startup/iar/start_iar.S']
CPPPATH = [cwd] CPPPATH = [cwd]
CPPDEFINES = [rtconfig.PART_TYPE] CPPDEFINES = [rtconfig.PART_TYPE]
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
Return('group') Return('group')

2
bsp/lm3s8962/SConstruct
View File

@ -23,7 +23,7 @@ Export('RTT_ROOT')
Export('rtconfig') Export('rtconfig')
# prepare building environment # prepare building environment
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) objs = PrepareBuilding(env, RTT_ROOT)
# make a building # make a building
DoBuilding(TARGET, objs) DoBuilding(TARGET, objs)

20
bsp/lm4f232/Libraries/startup/gcc/start_gcc.c
View File

@ -30,7 +30,7 @@
// Forward declaration of the default fault handlers. // Forward declaration of the default fault handlers.
// //
//***************************************************************************** //*****************************************************************************
void ResetISR(void); void Reset_Handler(void);
static void NmiSR(void); static void NmiSR(void);
static void FaultISR(void); static void FaultISR(void);
static void IntDefaultHandler(void); static void IntDefaultHandler(void);
@ -70,9 +70,9 @@ void (* const g_pfnVectors[])(void) =
{ {
(void (*)(void))((unsigned long)pulStack + sizeof(pulStack)), (void (*)(void))((unsigned long)pulStack + sizeof(pulStack)),
// The initial stack pointer // The initial stack pointer
ResetISR, // The reset handler Reset_Handler, // The reset handler
NmiSR, // The NMI handler NmiSR, // The NMI handler
HardFault_Handler, // The hard fault handler HardFault_Handler, // The hard fault handler
IntDefaultHandler, // The MPU fault handler IntDefaultHandler, // The MPU fault handler
IntDefaultHandler, // The bus fault handler IntDefaultHandler, // The bus fault handler
IntDefaultHandler, // The usage fault handler IntDefaultHandler, // The usage fault handler
@ -233,10 +233,10 @@ void (* const g_pfnVectors[])(void) =
// for the "data" segment resides immediately following the "text" segment. // for the "data" segment resides immediately following the "text" segment.
// //
//***************************************************************************** //*****************************************************************************
extern unsigned long _etext; extern unsigned long _sidata;
extern unsigned long _data; extern unsigned long _sdata;
extern unsigned long _edata; extern unsigned long _edata;
extern unsigned long _bss; extern unsigned long _sbss;
extern unsigned long _ebss; extern unsigned long _ebss;
//***************************************************************************** //*****************************************************************************
@ -250,15 +250,15 @@ extern unsigned long _ebss;
// //
//***************************************************************************** //*****************************************************************************
void void
ResetISR(void) Reset_Handler(void)
{ {
unsigned long *pulSrc, *pulDest; unsigned long *pulSrc, *pulDest;
// //
// Copy the data segment initializers from flash to SRAM. // Copy the data segment initializers from flash to SRAM.
// //
pulSrc = &_etext; pulSrc = &_sidata;
for(pulDest = &_data; pulDest < &_edata; ) for(pulDest = &_sdata; pulDest < &_edata; )
{ {
*pulDest++ = *pulSrc++; *pulDest++ = *pulSrc++;
} }
@ -266,7 +266,7 @@ ResetISR(void)
// //
// Zero fill the bss segment. // Zero fill the bss segment.
// //
__asm(" ldr r0, =_bss\n" __asm(" ldr r0, =_sbss\n"
" ldr r1, =_ebss\n" " ldr r1, =_ebss\n"
" mov r2, #0\n" " mov r2, #0\n"
" .thumb_func\n" " .thumb_func\n"

127
bsp/lm4f232/lm4f_rom.ld
View File

@ -25,19 +25,26 @@
/* Program Entry, set to mark it as "used" and avoid gc */ /* Program Entry, set to mark it as "used" and avoid gc */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000 CODE (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 DATA (rw) : ORIGIN = 0x10000000, LENGTH = 0x00008000
} }
ENTRY(Reset_Handler)
_system_stack_size = 0x200;
SECTIONS SECTIONS
{ {
.text : .text :
{ {
_text = .; . = ALIGN(4);
KEEP(*(.isr_vector)) KEEP(*(.isr_vector)) /* Startup code */
*(.text*) . = ALIGN(4);
*(.text) /* remaining code */
*(.text.*) /* remaining code */
*(.rodata) /* read-only data (constants) */
*(.rodata*) *(.rodata*)
_etext = .; *(.glue_7)
*(.glue_7t)
*(.gnu.linkonce.t*)
/* section information for finsh shell */ /* section information for finsh shell */
. = ALIGN(4); . = ALIGN(4);
@ -56,24 +63,108 @@ SECTIONS
__rt_init_end = .; __rt_init_end = .;
. = ALIGN(4); . = ALIGN(4);
} > FLASH PROVIDE(__ctors_start__ = .);
/* old GCC version uses .ctors */
KEEP(*(SORT(.ctors.*)))
KEEP(*(.ctors))
/* new GCC version uses .init_array */
KEEP (*(SORT(.init_array.*)))
KEEP (*(.init_array))
PROVIDE(__ctors_end__ = .);
.data : AT(ADDR(.text) + SIZEOF(.text)) . = ALIGN(4);
_etext = .;
} > CODE = 0
.ARM.extab :
{
*(.ARM.extab*)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_sidata = .;
} > CODE
/* .data section which is used for initialized data */
.data : AT (_sidata)
{ {
_data = .; . = ALIGN(4);
*(vtable) PROVIDE(__dtors_start__ = .);
*(.data*) KEEP(*(SORT(.dtors.*)))
_edata = .; KEEP(*(.dtors))
} > SRAM PROVIDE(__dtors_end__ = .);
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_sdata = . ;
*(.data)
*(.data.*)
*(.gnu.linkonce.d*)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_edata = . ;
} > DATA
.stack :
{
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
} >DATA
__bss_start = .;
.bss : .bss :
{ {
_bss = .; . = ALIGN(4);
*(.bss*) /* This is used by the startup in order to initialize the .bss secion */
*(COMMON) _sbss = .;
_ebss = .;
} > SRAM
*(.bss)
*(.bss.*)
*(COMMON)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */
_ebss = . ;
*(.bss.init)
} > DATA
__bss_end = .; __bss_end = .;
_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) }
} }

12
bsp/tm4c129x/libraries/startup/startup_gcc.c
View File

@ -201,10 +201,10 @@ void (* const g_pfnVectors[])(void) =
// for the "data" segment resides immediately following the "text" segment. // for the "data" segment resides immediately following the "text" segment.
// //
//***************************************************************************** //*****************************************************************************
extern uint32_t _ldata; extern uint32_t _sidata;
extern uint32_t _data; extern uint32_t _sdata;
extern uint32_t _edata; extern uint32_t _edata;
extern uint32_t _bss; extern uint32_t _sbss;
extern uint32_t _ebss; extern uint32_t _ebss;
//***************************************************************************** //*****************************************************************************
@ -225,8 +225,8 @@ ResetISR(void)
// //
// Copy the data segment initializers from flash to SRAM. // Copy the data segment initializers from flash to SRAM.
// //
pui32Src = &_ldata; pui32Src = &_sidata;
for(pui32Dest = &_data; pui32Dest < &_edata; ) for(pui32Dest = &_sdata; pui32Dest < &_edata; )
{ {
*pui32Dest++ = *pui32Src++; *pui32Dest++ = *pui32Src++;
} }
@ -234,7 +234,7 @@ ResetISR(void)
// //
// Zero fill the bss segment. // Zero fill the bss segment.
// //
__asm(" ldr r0, =_bss\n" __asm(" ldr r0, =_sbss\n"
" ldr r1, =_ebss\n" " ldr r1, =_ebss\n"
" mov r2, #0\n" " mov r2, #0\n"
" .thumb_func\n" " .thumb_func\n"

135
bsp/tm4c129x/tm4c_rom.ld
View File

@ -24,20 +24,29 @@
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 CODE (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000
SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 DATA (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000
} }
ENTRY(ResetISR)
_system_stack_size = 0x200;
SECTIONS SECTIONS
{ {
.text : .text :
{ {
_text = .; . = ALIGN(4);
KEEP(*(.isr_vector)) KEEP(*(.isr_vector)) /* Startup code */
*(.text*) . = ALIGN(4);
*(.text) /* remaining code */
*(.text.*) /* remaining code */
*(.rodata) /* read-only data (constants) */
*(.rodata*) *(.rodata*)
*(.glue_7)
/* section information for finsh shell */ *(.glue_7t)
*(.gnu.linkonce.t*)
/* section information for finsh shell */
. = ALIGN(4); . = ALIGN(4);
__fsymtab_start = .; __fsymtab_start = .;
KEEP(*(FSymTab)) KEEP(*(FSymTab))
@ -48,30 +57,114 @@ SECTIONS
__vsymtab_end = .; __vsymtab_end = .;
. = ALIGN(4); . = ALIGN(4);
/* section information for initial. */
. = ALIGN(4); . = ALIGN(4);
__rt_init_start = .; __rt_init_start = .;
KEEP(*(SORT(.rti_fn*))) KEEP(*(SORT(.rti_fn*)))
__rt_init_end = .; __rt_init_end = .;
. = ALIGN(4); . = ALIGN(4);
PROVIDE(__ctors_start__ = .);
/* old GCC version uses .ctors */
KEEP(*(SORT(.ctors.*)))
KEEP(*(.ctors))
/* new GCC version uses .init_array */
KEEP (*(SORT(.init_array.*)))
KEEP (*(.init_array))
PROVIDE(__ctors_end__ = .);
. = ALIGN(4);
_etext = .; _etext = .;
} > FLASH } > CODE = 0
.data : AT(ADDR(.text) + SIZEOF(.text)) .ARM.extab :
{
*(.ARM.extab*)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_sidata = .;
} > CODE
/* .data section which is used for initialized data */
.data : AT (_sidata)
{ {
_data = .; . = ALIGN(4);
_ldata = LOADADDR (.data); PROVIDE(__dtors_start__ = .);
*(vtable) KEEP(*(SORT(.dtors.*)))
*(.data*) KEEP(*(.dtors))
_edata = .; PROVIDE(__dtors_end__ = .);
} > SRAM
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_sdata = . ;
*(.data)
*(.data.*)
*(.gnu.linkonce.d*)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_edata = . ;
} > DATA
.stack :
{
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
} >DATA
__bss_start = .;
.bss : .bss :
{ {
_bss = .; . = ALIGN(4);
*(.bss*) /* This is used by the startup in order to initialize the .bss secion */
_sbss = .;
*(.bss)
*(.bss.*)
*(COMMON) *(COMMON)
_ebss = .;
} > SRAM . = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */
_ebss = . ;
*(.bss.init)
} > DATA
__bss_end = .;
_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) }
} }