diff --git a/bsp/stm32f40x/applications/application.c b/bsp/stm32f40x/applications/application.c index cc424ab85741b3922a9ee5e8ab04a77f7b1fb139..9c5f826fb9e81cf8aea2af7771a58bca76c5b793 100644 --- a/bsp/stm32f40x/applications/application.c +++ b/bsp/stm32f40x/applications/application.c @@ -17,6 +17,8 @@ */ /*@{*/ +#include + #include "stm32f4xx.h" #include #include @@ -46,98 +48,136 @@ void rt_init_thread_entry(void* parameter) lwip_sys_init(); rt_kprintf("TCP/IP initialized!\n"); } - - { - extern void eth_to_can_init(void); - extern void can_to_eth_init(void); - extern void upnp_init(void); - extern void setting_init(void); - - setting_init(); - eth_to_can_init(); - can_to_eth_init(); - upnp_init(); - } #endif + +//FS + +//GUI } +float f_var1; +float f_var2; +float f_var3; +float f_var4; + ALIGN(RT_ALIGN_SIZE) -static char thread_led_stack[1024]; -struct rt_thread thread_led; -static void rt_thread_entry_led(void* parameter) +static char thread_led1_stack[1024]; +struct rt_thread thread_led1; +static void rt_thread_entry_led1(void* parameter) { GPIO_InitTypeDef GPIO_InitStructure; - /* GPIOD Periph clock enable */ - RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOD, ENABLE); + /* GPIOD Periph clock enable */ + RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOD, ENABLE); + + /* Configure PD12, PD13, PD14 and PD15 in output pushpull mode */ + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12 | GPIO_Pin_13| GPIO_Pin_14| GPIO_Pin_15; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; + GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; + GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; + GPIO_Init(GPIOD, &GPIO_InitStructure); - /* Configure PD12, PD13, PD14 and PD15 in output pushpull mode */ - GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12 | GPIO_Pin_13| GPIO_Pin_14| GPIO_Pin_15; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; - GPIO_Init(GPIOD, &GPIO_InitStructure); + f_var1 = 3.141592653; + f_var2 = 123.456; + f_var3 = 0.123456789; + f_var4 = 1.00001; - while (1) - { - /* PD12 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_12); + while (1) + { + /* PD12 to be toggled */ + GPIO_SetBits(GPIOD, GPIO_Pin_12); - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND/2); + /* Insert delay */ + rt_thread_delay(RT_TICK_PER_SECOND/2); + f_var3 += f_var4; + f_var4 = f_var4 * f_var4; - /* PD13 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_13); + /* PD13 to be toggled */ + GPIO_SetBits(GPIOD, GPIO_Pin_13); - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND/2); + /* Insert delay */ + rt_thread_delay(RT_TICK_PER_SECOND/2); + f_var3 += f_var4; + f_var4 = f_var4 * f_var4; - /* PD14 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_14); + /* PD14 to be toggled */ + GPIO_SetBits(GPIOD, GPIO_Pin_14); - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND/2); + /* Insert delay */ + rt_thread_delay(RT_TICK_PER_SECOND/2); + f_var3 += f_var4; + f_var4 = f_var4 * f_var4; - /* PD15 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_15); + /* PD15 to be toggled */ + GPIO_SetBits(GPIOD, GPIO_Pin_15); - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND*2); + /* Insert delay */ + rt_thread_delay(RT_TICK_PER_SECOND*2); + f_var3 += f_var4; + f_var4 = f_var4 * f_var4; - GPIO_ResetBits(GPIOD, GPIO_Pin_12|GPIO_Pin_13|GPIO_Pin_14|GPIO_Pin_15); + GPIO_ResetBits(GPIOD, GPIO_Pin_12|GPIO_Pin_13|GPIO_Pin_14|GPIO_Pin_15); - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND); - } + /* Insert delay */ + rt_thread_delay(RT_TICK_PER_SECOND); + f_var3 += f_var4; + f_var4 = f_var4 * f_var4; + } +} + + +ALIGN(RT_ALIGN_SIZE) +static char thread_led2_stack[1024]; +struct rt_thread thread_led2; +static void rt_thread_entry_led2(void* parameter) +{ + float f_var_me; + + char str_buffer[256]; + while(1) + { + f_var_me = f_var1 * f_var2 + f_var3; + sprintf(str_buffer, "%f", f_var_me); + rt_kprintf("thread1 %s\r\n", str_buffer); + rt_thread_delay(RT_TICK_PER_SECOND); + } } int rt_application_init() { -// rt_thread_t init_thread; -// -//#if (RT_THREAD_PRIORITY_MAX == 32) -// init_thread = rt_thread_create("init", -// rt_init_thread_entry, RT_NULL, -// 2048, 8, 20); -//#else -// init_thread = rt_thread_create("init", -// rt_init_thread_entry, RT_NULL, -// 2048, 80, 20); -//#endif -// -// if (init_thread != RT_NULL) -// rt_thread_startup(init_thread); + rt_thread_t init_thread; + +#if (RT_THREAD_PRIORITY_MAX == 32) + init_thread = rt_thread_create("init", + rt_init_thread_entry, RT_NULL, + 2048, 8, 20); +#else + init_thread = rt_thread_create("init", + rt_init_thread_entry, RT_NULL, + 2048, 80, 20); +#endif + + if (init_thread != RT_NULL) + rt_thread_startup(init_thread); //------- init led1 thread - rt_thread_init(&thread_led, - "led", - rt_thread_entry_led, + rt_thread_init(&thread_led1, + "led1", + rt_thread_entry_led1, + RT_NULL, + &thread_led1_stack[0], + sizeof(thread_led1_stack),11,5); + rt_thread_startup(&thread_led1); + + //------- init led2 thread + rt_thread_init(&thread_led2, + "led2", + rt_thread_entry_led2, RT_NULL, - &thread_led_stack[0], - 1024,11,5); -// sizeof(thread_led_stack),11,5); - rt_thread_startup(&thread_led); + &thread_led2_stack[0], + sizeof(thread_led2_stack),11,5); + rt_thread_startup(&thread_led2); return 0; } diff --git a/bsp/stm32f40x/applications/startup.c b/bsp/stm32f40x/applications/startup.c index 04ecf32026772d8f187bc57b4be4042a93bb7265..0ddbed992b53bb37c16763c98f895b103b2900e8 100644 --- a/bsp/stm32f40x/applications/startup.c +++ b/bsp/stm32f40x/applications/startup.c @@ -32,12 +32,14 @@ extern void finsh_set_device(const char* device); #endif #ifdef __CC_ARM -//extern int Image$$RW_IRAM1$$ZI$$Limit; -extern int Image$$ER_ZI$$ZI$$Limit; +extern int Image$$RW_IRAM1$$ZI$$Limit; +#define STM32_SRAM_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit) #elif __ICCARM__ #pragma section="HEAP" +#define STM32_SRAM_BEGIN (__segment_end("HEAP")) #else extern int __bss_end; +#define STM32_SRAM_BEGIN (&__bss_end) #endif /******************************************************************************* @@ -78,16 +80,7 @@ void rtthread_startup(void) /* init timer system */ rt_system_timer_init(); -#ifdef RT_USING_HEAP - #ifdef __CC_ARM - rt_system_heap_init((void*)&Image$$ER_ZI$$ZI$$Limit, (void*)STM32_SRAM_END); - #elif __ICCARM__ - rt_system_heap_init(__segment_end("HEAP"), (void*)STM32_SRAM_END); - #else - /* init memory system */ - rt_system_heap_init((void*)&__bss_end, (void*)STM32_SRAM_END); - #endif -#endif + rt_system_heap_init((void*)STM32_SRAM_BEGIN, (void*)STM32_SRAM_END); /* init scheduler system */ rt_system_scheduler_init(); diff --git a/bsp/stm32f40x/project.uvopt b/bsp/stm32f40x/project.uvopt index 7847466d68f1851fb85c47ba5062ed0694b86be1..9661193e93d2180534d6654da1e641ab8991e803 100644 --- a/bsp/stm32f40x/project.uvopt +++ b/bsp/stm32f40x/project.uvopt @@ -21,7 +21,7 @@ - rt-thread_stm32f4xx + rt-thread 0x4 ARM-ADS @@ -43,7 +43,7 @@ 79 66 8 - .\obj\ + .\build\ 1 @@ -122,7 +122,7 @@ 0 DLGTARM - (1010=75,107,441,657,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0) + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) 0 @@ -135,49 +135,39 @@ -S - - - 0 - 0 - 396 - 1 -
134218176
- 0 - 0 - 0 - 0 - 1 - - - \\project\Libraries/CMSIS/ST/STM32F4xx/Source/Templates/arm/startup_stm32f4xx.s\396 - - - 1 - 0 - 53 - 1 -
134230100
- 0 - 0 - 0 - 0 - 1 - - - \\project\applications/startup.c\53 - - 0 1 - uart2_debug + f_var1 + + + 1 + 1 + f_var2 + + + 2 + 1 + f_var3 + + + 3 + 1 + f_var4 + + + 0 + 2 + f_var2 + + 0 0 - 1 + 0 0 0 0 @@ -216,10 +206,10 @@ 1 0 0 - 6 + 32 0 - 81 - 85 + 82 + 96 0 applications\application.c application.c @@ -232,8 +222,8 @@ 0 0 0 - 116 - 121 + 107 + 114 0 applications\startup.c startup.c @@ -279,10 +269,10 @@ 1 0 0 - 14 + 0 0 - 166 - 170 + 0 + 0 0 drivers\stm32f4xx_it.c stm32f4xx_it.c @@ -295,8 +285,8 @@ 0 0 0 - 229 - 235 + 0 + 0 0 drivers\usart.c usart.c @@ -325,20 +315,6 @@ 3 8 - 2 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - Libraries\CMSIS\ST\STM32F4xx\Source\Templates\arm\startup_stm32f4xx.s - startup_stm32f4xx.s - - - 3 - 9 1 0 0 @@ -352,7 +328,7 @@ 3 - 10 + 9 1 0 0 @@ -366,7 +342,7 @@ 3 - 11 + 10 1 0 0 @@ -380,7 +356,7 @@ 3 - 12 + 11 1 0 0 @@ -394,7 +370,7 @@ 3 - 13 + 12 1 0 0 @@ -408,7 +384,7 @@ 3 - 14 + 13 1 0 0 @@ -422,7 +398,7 @@ 3 - 15 + 14 1 0 0 @@ -436,7 +412,7 @@ 3 - 16 + 15 1 0 0 @@ -450,7 +426,7 @@ 3 - 17 + 16 1 0 0 @@ -464,7 +440,7 @@ 3 - 18 + 17 1 0 0 @@ -478,7 +454,7 @@ 3 - 19 + 18 1 0 0 @@ -492,7 +468,7 @@ 3 - 20 + 19 1 0 0 @@ -506,7 +482,7 @@ 3 - 21 + 20 1 0 0 @@ -520,7 +496,7 @@ 3 - 22 + 21 1 0 0 @@ -534,7 +510,7 @@ 3 - 23 + 22 1 0 0 @@ -548,7 +524,7 @@ 3 - 24 + 23 1 0 0 @@ -562,7 +538,7 @@ 3 - 25 + 24 1 0 0 @@ -576,7 +552,7 @@ 3 - 26 + 25 1 0 0 @@ -590,7 +566,7 @@ 3 - 27 + 26 1 0 0 @@ -604,7 +580,7 @@ 3 - 28 + 27 1 0 0 @@ -618,7 +594,7 @@ 3 - 29 + 28 1 0 0 @@ -632,7 +608,7 @@ 3 - 30 + 29 1 0 0 @@ -646,7 +622,7 @@ 3 - 31 + 30 1 0 0 @@ -660,7 +636,7 @@ 3 - 32 + 31 1 0 0 @@ -674,7 +650,7 @@ 3 - 33 + 32 1 0 0 @@ -688,7 +664,7 @@ 3 - 34 + 33 1 0 0 @@ -702,7 +678,7 @@ 3 - 35 + 34 1 0 0 @@ -716,7 +692,7 @@ 3 - 36 + 35 1 0 0 @@ -730,7 +706,7 @@ 3 - 37 + 36 1 0 0 @@ -744,11 +720,11 @@ 3 - 38 + 37 1 0 0 - 14 + 0 0 0 0 @@ -758,7 +734,7 @@ 3 - 39 + 38 1 0 0 @@ -770,6 +746,20 @@ Libraries\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_wwdg.c stm32f4xx_wwdg.c + + 3 + 39 + 2 + 0 + 0 + 0 + 0 + 173 + 173 + 0 + Libraries\CMSIS\ST\STM32F4xx\Source\Templates\arm\startup_stm32f4xx.s + startup_stm32f4xx.s + @@ -788,8 +778,8 @@ 0 0 0 - ..\..\src\device.c - device.c + ..\..\src\clock.c + clock.c 4 @@ -802,8 +792,8 @@ 0 0 0 - ..\..\src\thread.c - thread.c + ..\..\src\device.c + device.c 4 @@ -813,11 +803,11 @@ 0 0 0 - 0 - 0 + 149 + 156 0 - ..\..\src\scheduler.c - scheduler.c + ..\..\src\idle.c + idle.c 4 @@ -830,8 +820,8 @@ 0 0 0 - ..\..\src\timer.c - timer.c + ..\..\src\ipc.c + ipc.c 4 @@ -872,8 +862,8 @@ 0 0 0 - ..\..\src\clock.c - clock.c + ..\..\src\mem.c + mem.c 4 @@ -886,8 +876,8 @@ 0 0 0 - ..\..\src\object.c - object.c + ..\..\src\mempool.c + mempool.c 4 @@ -900,8 +890,8 @@ 0 0 0 - ..\..\src\mempool.c - mempool.c + ..\..\src\object.c + object.c 4 @@ -914,8 +904,8 @@ 0 0 0 - ..\..\src\ipc.c - ipc.c + ..\..\src\scheduler.c + scheduler.c 4 @@ -925,11 +915,11 @@ 0 0 0 - 59 - 64 + 0 + 0 0 - ..\..\src\idle.c - idle.c + ..\..\src\thread.c + thread.c 4 @@ -942,8 +932,8 @@ 0 0 0 - ..\..\src\mem.c - mem.c + ..\..\src\timer.c + timer.c diff --git a/bsp/stm32f40x/project.uvproj b/bsp/stm32f40x/project.uvproj index ce9eff10e8161b7d6b359d5cdbd82b5d2ba022bb..60affcce001fb3a36bd67344c8dbc9b06ce2a4ee 100644 --- a/bsp/stm32f40x/project.uvproj +++ b/bsp/stm32f40x/project.uvproj @@ -43,14 +43,14 @@ 0 1 - .\obj\ - project + .\build\ + rtthread-stm32f4xx 1 0 0 1 1 - .\obj\ + .\build\ 1 0 0 @@ -158,7 +158,7 @@ 1 0 0 - 0 + 1 1 4100 @@ -208,7 +208,7 @@ 1 0 8 - 1 + 0 0 0 3 @@ -334,7 +334,7 @@ 1 0 0 - 1 + 0 0 0 0 @@ -344,9 +344,9 @@ 0 - STM32F4XX, USE_STDPERIPH_DRIVER + USE_STDPERIPH_DRIVER - Libraries\CMSIS\ST\STM32F4xx\Include;..\..\include;drivers;.;applications;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;Libraries\STM32F4xx_StdPeriph_Driver\inc;..\..\components\finsh;Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x + .;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x;Libraries\CMSIS\Include;Libraries\CMSIS\ST\STM32F4xx\Include;Libraries\STM32F4xx_StdPeriph_Driver\inc;applications;drivers @@ -365,7 +365,7 @@ - 0 + 1 0 0 0 @@ -431,11 +431,6 @@ 1 Libraries\CMSIS\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c - - startup_stm32f4xx.s - 2 - Libraries\CMSIS\ST\STM32F4xx\Source\Templates\arm\startup_stm32f4xx.s - misc.c 1 @@ -591,30 +586,35 @@ 1 Libraries\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_wwdg.c + + startup_stm32f4xx.s + 2 + Libraries\CMSIS\ST\STM32F4xx\Source\Templates\arm\startup_stm32f4xx.s + Kernel - device.c + clock.c 1 - ..\..\src\device.c + ..\..\src\clock.c - thread.c + device.c 1 - ..\..\src\thread.c + ..\..\src\device.c - scheduler.c + idle.c 1 - ..\..\src\scheduler.c + ..\..\src\idle.c - timer.c + ipc.c 1 - ..\..\src\timer.c + ..\..\src\ipc.c irq.c @@ -627,34 +627,34 @@ ..\..\src\kservice.c - clock.c + mem.c 1 - ..\..\src\clock.c + ..\..\src\mem.c - object.c + mempool.c 1 - ..\..\src\object.c + ..\..\src\mempool.c - mempool.c + object.c 1 - ..\..\src\mempool.c + ..\..\src\object.c - ipc.c + scheduler.c 1 - ..\..\src\ipc.c + ..\..\src\scheduler.c - idle.c + thread.c 1 - ..\..\src\idle.c + ..\..\src\thread.c - mem.c + timer.c 1 - ..\..\src\mem.c + ..\..\src\timer.c diff --git a/bsp/stm32f40x/rtconfig.h b/bsp/stm32f40x/rtconfig.h index 07d7bb3f46f34b99361d476b3b3327d3d7f9c87f..8b0fe0c1c7d9950464adfd753d0bc0df8704dbff 100644 --- a/bsp/stm32f40x/rtconfig.h +++ b/bsp/stm32f40x/rtconfig.h @@ -6,7 +6,7 @@ #define RT_NAME_MAX 8 /* RT_ALIGN_SIZE*/ -#define RT_ALIGN_SIZE 4 +#define RT_ALIGN_SIZE 8 /* PRIORITY_MAX */ #define RT_THREAD_PRIORITY_MAX 32 diff --git a/bsp/stm32f40x/rtconfig.py b/bsp/stm32f40x/rtconfig.py index d67fb87b1deeb535c43329aeda54882a4f29b04e..71ac7a04f252f7c5628328d50758ec1479ffe884 100644 --- a/bsp/stm32f40x/rtconfig.py +++ b/bsp/stm32f40x/rtconfig.py @@ -31,8 +31,8 @@ if PLATFORM == 'gcc': OBJDUMP = PREFIX + 'objdump' OBJCPY = PREFIX + 'objcopy' - DEVICE = ' -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections' - CFLAGS = DEVICE + DEVICE = ' -mcpu=cortex-m4 -mthumb -mfpu=vfp -mfloat-abi=softfp -ffunction-sections -fdata-sections' + CFLAGS = DEVICE AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp' LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-stm32.map,-cref,-u,Reset_Handler -T stm32_rom.ld' diff --git a/bsp/stm32f40x/stm32_rom.ld b/bsp/stm32f40x/stm32_rom.ld new file mode 100644 index 0000000000000000000000000000000000000000..69ca301a9293f26839c1536f703d771f0dfc0c2f --- /dev/null +++ b/bsp/stm32f40x/stm32_rom.ld @@ -0,0 +1,134 @@ +/* + * linker script for STM32F10x with GNU ld + * bernard.xiong 2009-10-14 + */ + +/* Program Entry, set to mark it as "used" and avoid gc */ +MEMORY +{ + CODE (rx) : ORIGIN = 0x08000000, LENGTH = 512k /* 512KB flash */ + DATA (rw) : ORIGIN = 0x20000000, LENGTH = 64k /* 64K sram */ +} +ENTRY(Reset_Handler) +_system_stack_size = 0x100; + +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) + *(.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); + + . = ALIGN(4); + _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.*) + + /* This is used by the startup in order to initialize the .data secion */ + _sidata = .; + } > CODE + __exidx_end = .; + + /* .data section which is used for initialized data */ + + .data : AT (_sidata) + { + . = 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 : + { + . = ALIGN(4); + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; + + *(.bss) + *(.bss.*) + *(COMMON) + + . = 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) } +} diff --git a/bsp/stm32f40x/template.uvproj b/bsp/stm32f40x/template.uvproj index f570190f28e8aa5fbccfb729034a07f5c01441e9..9d416799e828b84bca68018b74e57b27c9989337 100644 --- a/bsp/stm32f40x/template.uvproj +++ b/bsp/stm32f40x/template.uvproj @@ -43,14 +43,14 @@ 0 1 - .\obj\ - project + .\build\ + rtthread-stm32f4xx 1 0 0 1 1 - .\obj\ + .\build\ 1 0 0 @@ -158,7 +158,7 @@ 1 0 0 - 0 + 1 1 4100 @@ -208,7 +208,7 @@ 1 0 8 - 1 + 0 0 0 3 @@ -334,7 +334,7 @@ 1 0 0 - 1 + 0 0 0 0 @@ -365,7 +365,7 @@ - 0 + 1 0 0 0