diff --git a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.elf b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.elf index 9eb6b943..7335d1fb 100644 Binary files a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.elf and b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.elf differ diff --git a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.map b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.map index 7d404d10..7b52db2d 100644 --- a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.map +++ b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.map @@ -1,232 +1,232 @@ - -bin/demoprog_nucleo_stm32f103rb.elf: file format elf32-littlearm -bin/demoprog_nucleo_stm32f103rb.elf -architecture: arm, flags 0x00000112: -EXEC_P, HAS_SYMS, D_PAGED -start address 0x08002000 - -Program Header: -0x70000001 off 0x00002900 vaddr 0x08002900 paddr 0x08002900 align 2**2 - filesz 0x00000008 memsz 0x00000008 flags r-- - LOAD off 0x00000000 vaddr 0x08000000 paddr 0x08000000 align 2**16 - filesz 0x00002908 memsz 0x00002908 flags r-x - LOAD off 0x00010000 vaddr 0x20000000 paddr 0x08002908 align 2**16 - filesz 0x0000007c memsz 0x000000eb flags rw- -private flags = 5000200: [Version5 EABI] [soft-float ABI] - -Sections: -Idx Name Size VMA LMA File off Algn - 0 .text 00000900 08002000 08002000 00002000 2**2 - CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 .ARM.exidx 00000008 08002900 08002900 00002900 2**2 - CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 .data 0000007c 20000000 08002908 00010000 2**2 - CONTENTS, ALLOC, LOAD, DATA - 3 .bss 0000006f 2000007c 08002984 0001007c 2**2 - ALLOC - 4 .heap 00000800 200000f0 200000f0 00010080 2**3 - CONTENTS, READONLY - 5 .stack_dummy 00000800 200000f0 200000f0 00010880 2**3 - CONTENTS, READONLY - 6 .ARM.attributes 00000029 00000000 00000000 00011080 2**0 - CONTENTS, READONLY - 7 .comment 0000006e 00000000 00000000 000110a9 2**0 - CONTENTS, READONLY - 8 .debug_line 000029b6 00000000 00000000 00011117 2**0 - CONTENTS, READONLY, DEBUGGING - 9 .debug_info 000030cb 00000000 00000000 00013acd 2**0 - CONTENTS, READONLY, DEBUGGING - 10 .debug_abbrev 00000cd1 00000000 00000000 00016b98 2**0 - CONTENTS, READONLY, DEBUGGING - 11 .debug_aranges 000003e0 00000000 00000000 00017870 2**3 - CONTENTS, READONLY, DEBUGGING - 12 .debug_ranges 00000340 00000000 00000000 00017c50 2**0 - CONTENTS, READONLY, DEBUGGING - 13 .debug_macro 00002968 00000000 00000000 00017f90 2**0 - CONTENTS, READONLY, DEBUGGING - 14 .debug_str 000513f3 00000000 00000000 0001a8f8 2**0 - CONTENTS, READONLY, DEBUGGING - 15 .debug_frame 000007f0 00000000 00000000 0006bcec 2**2 - CONTENTS, READONLY, DEBUGGING - 16 .debug_loc 000013ab 00000000 00000000 0006c4dc 2**0 - CONTENTS, READONLY, DEBUGGING -SYMBOL TABLE: -08002000 l d .text 00000000 .text -08002900 l d .ARM.exidx 00000000 .ARM.exidx -20000000 l d .data 00000000 .data -2000007c l d .bss 00000000 .bss -200000f0 l d .heap 00000000 .heap -200000f0 l d .stack_dummy 00000000 .stack_dummy -00000000 l d .ARM.attributes 00000000 .ARM.attributes -00000000 l d .comment 00000000 .comment -00000000 l d .debug_line 00000000 .debug_line -00000000 l d .debug_info 00000000 .debug_info -00000000 l d .debug_abbrev 00000000 .debug_abbrev -00000000 l d .debug_aranges 00000000 .debug_aranges -00000000 l d .debug_ranges 00000000 .debug_ranges -00000000 l d .debug_macro 00000000 .debug_macro -00000000 l d .debug_str 00000000 .debug_str -00000000 l d .debug_frame 00000000 .debug_frame -00000000 l d .debug_loc 00000000 .debug_loc -00000000 l df *ABS* 00000000 obj/startup_stm32f10x_md.o -00000800 l *ABS* 00000000 Stack_Size -00000800 l *ABS* 00000000 Heap_Size -080021ca l .text 00000000 .flash_to_ram_loop -080021fc l .text 00000000 .fill_zero_bss -080021f8 l .text 00000000 .loop_zero_bss -00000000 l df *ABS* 00000000 crtstuff.c -080028fc l O .text 00000000 __EH_FRAME_BEGIN__ -080020f0 l F .text 00000000 __do_global_dtors_aux -2000007c l .bss 00000000 completed.8603 -20000078 l O .data 00000000 __do_global_dtors_aux_fini_array_entry -08002114 l F .text 00000000 frame_dummy -20000080 l .bss 00000000 object.8608 -20000074 l O .data 00000000 __frame_dummy_init_array_entry -00000000 l df *ABS* 00000000 c:/progra~2/gnutoo~1/50a5a~1.420/bin/../lib/gcc/arm-none-eabi/5.4.1/../../../../arm-none-eabi/lib/armv7-m/crt0.o -00000000 l df *ABS* 00000000 _exit.c -00000000 l df *ABS* 00000000 stm32f10x_gpio.c -00000000 l df *ABS* 00000000 stm32f10x_usart.c -00000000 l df *ABS* 00000000 stm32f10x_rcc.c -20000000 l O .data 00000004 ADCPrescTable -20000004 l O .data 00000010 APBAHBPrescTable -00000000 l df *ABS* 00000000 timer.c -20000098 l O .bss 00000004 millisecond_counter -00000000 l df *ABS* 00000000 led.c -2000009c l O .bss 00000004 timer_counter_last.6552 -200000a0 l O .bss 00000001 led_toggle_state.6551 -00000000 l df *ABS* 00000000 main.c -080025e0 l F .text 00000104 Init -00000000 l df *ABS* 00000000 boot.c -080026f8 l F .text 00000080 BootComUartInit -08002778 l F .text 00000024 UartReceiveByte -080027c0 l F .text 00000094 BootComUartCheckActivationRequest -200000a4 l O .bss 00000004 xcpCtoRxStartTime.6570 -200000a8 l O .bss 00000041 xcpCtoReqPacket.6567 -200000e9 l O .bss 00000001 xcpCtoRxLength.6568 -200000ea l O .bss 00000001 xcpCtoRxInProgress.6569 -00000000 l df *ABS* 00000000 exit.c -00000000 l df *ABS* 00000000 init.c -00000000 l df *ABS* 00000000 memset.c -00000000 l df *ABS* 00000000 c:/progra~2/gnutoo~1/50a5a~1.420/bin/../lib/gcc/arm-none-eabi/5.4.1/armv7-m/crti.o -00000000 l df *ABS* 00000000 c:/progra~2/gnutoo~1/50a5a~1.420/bin/../lib/gcc/arm-none-eabi/5.4.1/armv7-m/crtn.o -00000000 l df *ABS* 00000000 impure.c -20000014 l O .data 00000060 impure_data -00000000 l df *ABS* 00000000 crtstuff.c -080028fc l O .text 00000000 __FRAME_END__ -00000000 l df *ABS* 00000000 -20000078 l .data 00000000 __init_array_end -20000074 l .data 00000000 __preinit_array_end -20000074 l .data 00000000 __init_array_start -20000074 l .data 00000000 __preinit_array_start -0800222a w F .text 00000002 EXTI2_IRQHandler -200000f0 g .heap 00000800 __HeapBase -08002212 w F .text 00000002 DebugMon_Handler -00000800 g *ABS* 00000000 __HEAP_SIZE -20000000 g .data 00000000 __data_start__ -08002250 w F .text 00000002 TIM1_CC_IRQHandler -08002208 w F .text 00000002 HardFault_Handler -08002554 g F .text 00000010 SysTick_Handler -0800221c w F .text 00000002 PVD_IRQHandler -08002214 w F .text 00000002 PendSV_Handler -08002206 w F .text 00000002 NMI_Handler -08002908 g .ARM.exidx 00000000 __exidx_end -0800222c w F .text 00000002 EXTI3_IRQHandler -08002908 g .ARM.exidx 00000000 __etext -0800240c g F .text 0000000e USART_GetFlagStatus -08002226 w F .text 00000002 EXTI0_IRQHandler -0800225c w F .text 00000002 I2C2_EV_IRQHandler -08002404 g F .text 00000008 USART_ReceiveData -0800220e w F .text 00000002 UsageFault_Handler -080024d8 g F .text 0000001c RCC_APB2PeriphClockCmd -0800223e w F .text 00000002 ADC1_2_IRQHandler -0800227c g F .text 0000009a GPIO_Init -200008f0 g .heap 00000000 __HeapLimit -2000007c g .bss 00000000 __bss_start__ -08002260 w F .text 00000002 SPI1_IRQHandler -080023e8 g F .text 0000001c USART_Cmd -0800221e w F .text 00000002 TAMPER_IRQHandler -080024f4 g F .text 0000001c RCC_APB1PeriphClockCmd -08002900 g .text 00000000 __exidx_start -080028f8 g O .text 00000004 _global_impure_ptr -08002884 g F .text 0000004c __libc_init_array -08002236 w F .text 00000002 DMA1_Channel4_IRQHandler -0800214c g F .text 00000000 _mainCRTStartup -080028e0 g F .text 00000000 _init -080027a4 g F .text 0000001c BootActivate -08002268 w F .text 00000002 USART3_IRQHandler -00000000 w *UND* 00000000 __libc_fini_array -08002220 w F .text 00000002 RTC_IRQHandler -0800223c w F .text 00000002 DMA1_Channel7_IRQHandler -080021c0 g F .text 00000030 Reset_Handler -08002244 w F .text 00000002 CAN1_RX1_IRQHandler -08002564 g F .text 00000030 LedInit -08002318 g F .text 00000004 GPIO_SetBits -08002256 w F .text 00000002 TIM4_IRQHandler -00000000 w *UND* 00000000 __sf_fake_stderr -00000000 w *UND* 00000000 __deregister_frame_info -200000f0 g .heap 00000000 end -08002258 w F .text 00000002 I2C1_EV_IRQHandler -2000007c g .data 00000000 __data_end__ -0800241c g F .text 000000bc RCC_GetClocksFreq -0800223a w F .text 00000002 DMA1_Channel6_IRQHandler -08002320 g F .text 000000c8 USART_Init -200000eb g .bss 00000000 __bss_end__ -00000800 g *ABS* 00000000 __STACK_SIZE -08002254 w F .text 00000002 TIM3_IRQHandler -08002224 w F .text 00000002 RCC_IRQHandler -0800224e w F .text 00000002 TIM1_TRG_COM_IRQHandler -00000000 w *UND* 00000000 __call_exitprocs -08002230 w F .text 00000002 DMA1_Channel1_IRQHandler -08002218 w F .text 00000002 Default_Handler -0800214c g F .text 00000000 _start -0800226a w F .text 00000002 EXTI15_10_IRQHandler -00000000 w *UND* 00000000 software_init_hook -0800231c g F .text 00000004 GPIO_ResetBits -08002248 w F .text 00000002 EXTI9_5_IRQHandler -08002262 w F .text 00000002 SPI2_IRQHandler -00000000 w *UND* 00000000 __sf_fake_stdin -080028d0 g F .text 00000010 memset -0800220a w F .text 00000002 MemManage_Handler -08002000 g .text 000000f0 __isr_vector -080026e4 g F .text 00000014 main -08002210 w F .text 00000002 SVC_Handler -00000000 w *UND* 00000000 hardware_init_hook -200000f0 g .heap 00000000 __end__ -08002238 w F .text 00000002 DMA1_Channel5_IRQHandler -0800222e w F .text 00000002 EXTI4_IRQHandler -08002510 g F .text 0000000c TimerSet -08002242 w F .text 00000002 USB_LP_CAN1_RX0_IRQHandler -0800279c g F .text 00000008 BootComInit -080028ec g F .text 00000000 _fini -08002240 w F .text 00000002 USB_HP_CAN1_TX_IRQHandler -00000000 w *UND* 00000000 atexit -08002234 w F .text 00000002 DMA1_Channel3_IRQHandler -20005000 g .bss 00000000 __StackTop -0800224c w F .text 00000002 TIM1_UP_IRQHandler -0800221a w F .text 00000002 WWDG_IRQHandler -08002594 g F .text 0000004c LedToggle -08002252 w F .text 00000002 TIM2_IRQHandler -0800224a w F .text 00000002 TIM1_BRK_IRQHandler -20005000 g *ABS* 00000000 __stack -08002228 w F .text 00000002 EXTI1_IRQHandler -0800226c w F .text 00000002 RTCAlarm_IRQHandler -20004800 g *ABS* 00000800 __StackLimit -08002266 w F .text 00000002 USART2_IRQHandler -0800285c g F .text 00000028 exit -0800225e w F .text 00000002 I2C2_ER_IRQHandler -08002232 w F .text 00000002 DMA1_Channel2_IRQHandler -00000000 w *UND* 00000000 __sf_fake_stdout -08002854 g F .text 00000008 BootComCheckActivationRequest -08002246 w F .text 00000002 CAN1_SCE_IRQHandler -08002222 w F .text 00000002 FLASH_IRQHandler -08002278 w F .text 00000002 _exit -0800220c w F .text 00000002 BusFault_Handler -08002264 w F .text 00000002 USART1_IRQHandler -0800225a w F .text 00000002 I2C1_ER_IRQHandler -08002548 g F .text 0000000c TimerGet -00000000 w *UND* 00000000 _Jv_RegisterClasses -0800251c g F .text 0000002c TimerInit -00000000 w *UND* 00000000 __register_frame_info -0800226e w F .text 00000002 USBWakeUp_IRQHandler - - + +bin/demoprog_nucleo_stm32f103rb.elf: file format elf32-littlearm +bin/demoprog_nucleo_stm32f103rb.elf +architecture: arm, flags 0x00000112: +EXEC_P, HAS_SYMS, D_PAGED +start address 0x08002000 + +Program Header: +0x70000001 off 0x00002904 vaddr 0x08002904 paddr 0x08002904 align 2**2 + filesz 0x00000008 memsz 0x00000008 flags r-- + LOAD off 0x00000000 vaddr 0x08000000 paddr 0x08000000 align 2**16 + filesz 0x0000290c memsz 0x0000290c flags r-x + LOAD off 0x00010000 vaddr 0x20000000 paddr 0x0800290c align 2**16 + filesz 0x0000007c memsz 0x000000eb flags rw- +private flags = 5000200: [Version5 EABI] [soft-float ABI] + +Sections: +Idx Name Size VMA LMA File off Algn + 0 .text 00000904 08002000 08002000 00002000 2**2 + CONTENTS, ALLOC, LOAD, READONLY, CODE + 1 .ARM.exidx 00000008 08002904 08002904 00002904 2**2 + CONTENTS, ALLOC, LOAD, READONLY, DATA + 2 .data 0000007c 20000000 0800290c 00010000 2**2 + CONTENTS, ALLOC, LOAD, DATA + 3 .bss 0000006f 2000007c 08002988 0001007c 2**2 + ALLOC + 4 .heap 00000800 200000f0 200000f0 00010080 2**3 + CONTENTS, READONLY + 5 .stack_dummy 00000800 200000f0 200000f0 00010880 2**3 + CONTENTS, READONLY + 6 .ARM.attributes 00000029 00000000 00000000 00011080 2**0 + CONTENTS, READONLY + 7 .comment 0000006e 00000000 00000000 000110a9 2**0 + CONTENTS, READONLY + 8 .debug_line 000029d6 00000000 00000000 00011117 2**0 + CONTENTS, READONLY, DEBUGGING + 9 .debug_info 000030d5 00000000 00000000 00013aed 2**0 + CONTENTS, READONLY, DEBUGGING + 10 .debug_abbrev 00000cd1 00000000 00000000 00016bc2 2**0 + CONTENTS, READONLY, DEBUGGING + 11 .debug_aranges 000003e0 00000000 00000000 00017898 2**3 + CONTENTS, READONLY, DEBUGGING + 12 .debug_loc 000013ab 00000000 00000000 00017c78 2**0 + CONTENTS, READONLY, DEBUGGING + 13 .debug_ranges 00000340 00000000 00000000 00019023 2**0 + CONTENTS, READONLY, DEBUGGING + 14 .debug_macro 0000e158 00000000 00000000 00019363 2**0 + CONTENTS, READONLY, DEBUGGING + 15 .debug_str 000513fd 00000000 00000000 000274bb 2**0 + CONTENTS, READONLY, DEBUGGING + 16 .debug_frame 000007f0 00000000 00000000 000788b8 2**2 + CONTENTS, READONLY, DEBUGGING +SYMBOL TABLE: +08002000 l d .text 00000000 .text +08002904 l d .ARM.exidx 00000000 .ARM.exidx +20000000 l d .data 00000000 .data +2000007c l d .bss 00000000 .bss +200000f0 l d .heap 00000000 .heap +200000f0 l d .stack_dummy 00000000 .stack_dummy +00000000 l d .ARM.attributes 00000000 .ARM.attributes +00000000 l d .comment 00000000 .comment +00000000 l d .debug_line 00000000 .debug_line +00000000 l d .debug_info 00000000 .debug_info +00000000 l d .debug_abbrev 00000000 .debug_abbrev +00000000 l d .debug_aranges 00000000 .debug_aranges +00000000 l d .debug_loc 00000000 .debug_loc +00000000 l d .debug_ranges 00000000 .debug_ranges +00000000 l d .debug_macro 00000000 .debug_macro +00000000 l d .debug_str 00000000 .debug_str +00000000 l d .debug_frame 00000000 .debug_frame +00000000 l df *ABS* 00000000 obj/startup_stm32f10x_md.o +00000800 l *ABS* 00000000 Stack_Size +00000800 l *ABS* 00000000 Heap_Size +080021ca l .text 00000000 .flash_to_ram_loop +080021fc l .text 00000000 .fill_zero_bss +080021f8 l .text 00000000 .loop_zero_bss +00000000 l df *ABS* 00000000 crtstuff.c +08002900 l O .text 00000000 __EH_FRAME_BEGIN__ +080020f0 l F .text 00000000 __do_global_dtors_aux +2000007c l .bss 00000000 completed.8603 +20000078 l O .data 00000000 __do_global_dtors_aux_fini_array_entry +08002114 l F .text 00000000 frame_dummy +20000080 l .bss 00000000 object.8608 +20000074 l O .data 00000000 __frame_dummy_init_array_entry +00000000 l df *ABS* 00000000 /opt/gcc-arm-none-eabi-5_4-2016q3/bin/../lib/gcc/arm-none-eabi/5.4.1/../../../../arm-none-eabi/lib/armv7-m/crt0.o +00000000 l df *ABS* 00000000 timer.c +20000098 l O .bss 00000004 millisecond_counter +00000000 l df *ABS* 00000000 main.c +080022cc l F .text 00000104 Init +00000000 l df *ABS* 00000000 stm32f10x_usart.c +00000000 l df *ABS* 00000000 stm32f10x_rcc.c +20000000 l O .data 00000004 ADCPrescTable +20000004 l O .data 00000010 APBAHBPrescTable +00000000 l df *ABS* 00000000 stm32f10x_gpio.c +00000000 l df *ABS* 00000000 _exit.c +00000000 l df *ABS* 00000000 led.c +2000009c l O .bss 00000004 timer_counter_last.6552 +200000a0 l O .bss 00000001 led_toggle_state.6551 +00000000 l df *ABS* 00000000 boot.c +080026f8 l F .text 00000080 BootComUartInit +08002778 l F .text 00000024 UartReceiveByte +080027c0 l F .text 00000098 BootComUartCheckActivationRequest +200000a4 l O .bss 00000004 xcpCtoRxStartTime.6570 +200000a8 l O .bss 00000041 xcpCtoReqPacket.6567 +200000e9 l O .bss 00000001 xcpCtoRxLength.6568 +200000ea l O .bss 00000001 xcpCtoRxInProgress.6569 +00000000 l df *ABS* 00000000 exit.c +00000000 l df *ABS* 00000000 init.c +00000000 l df *ABS* 00000000 memset.c +00000000 l df *ABS* 00000000 /opt/gcc-arm-none-eabi-5_4-2016q3/bin/../lib/gcc/arm-none-eabi/5.4.1/armv7-m/crti.o +00000000 l df *ABS* 00000000 /opt/gcc-arm-none-eabi-5_4-2016q3/bin/../lib/gcc/arm-none-eabi/5.4.1/armv7-m/crtn.o +00000000 l df *ABS* 00000000 impure.c +20000014 l O .data 00000060 impure_data +00000000 l df *ABS* 00000000 crtstuff.c +08002900 l O .text 00000000 __FRAME_END__ +00000000 l df *ABS* 00000000 +20000078 l .data 00000000 __init_array_end +20000074 l .data 00000000 __preinit_array_end +20000074 l .data 00000000 __init_array_start +20000074 l .data 00000000 __preinit_array_start +0800222a w F .text 00000002 EXTI2_IRQHandler +200000f0 g .heap 00000800 __HeapBase +08002212 w F .text 00000002 DebugMon_Handler +00000800 g *ABS* 00000000 __HEAP_SIZE +20000000 g .data 00000000 __data_start__ +08002250 w F .text 00000002 TIM1_CC_IRQHandler +08002208 w F .text 00000002 HardFault_Handler +080022bc g F .text 00000010 SysTick_Handler +0800221c w F .text 00000002 PVD_IRQHandler +08002214 w F .text 00000002 PendSV_Handler +08002206 w F .text 00000002 NMI_Handler +0800290c g .ARM.exidx 00000000 __exidx_end +0800222c w F .text 00000002 EXTI3_IRQHandler +0800290c g .ARM.exidx 00000000 __etext +080024d0 g F .text 0000000e USART_GetFlagStatus +08002226 w F .text 00000002 EXTI0_IRQHandler +0800225c w F .text 00000002 I2C2_EV_IRQHandler +080024c8 g F .text 00000008 USART_ReceiveData +0800220e w F .text 00000002 UsageFault_Handler +0800259c g F .text 0000001c RCC_APB2PeriphClockCmd +0800223e w F .text 00000002 ADC1_2_IRQHandler +080025d4 g F .text 0000009a GPIO_Init +200008f0 g .heap 00000000 __HeapLimit +2000007c g .bss 00000000 __bss_start__ +08002260 w F .text 00000002 SPI1_IRQHandler +080024ac g F .text 0000001c USART_Cmd +0800221e w F .text 00000002 TAMPER_IRQHandler +080025b8 g F .text 0000001c RCC_APB1PeriphClockCmd +08002904 g .text 00000000 __exidx_start +080028fc g O .text 00000004 _global_impure_ptr +08002888 g F .text 0000004c __libc_init_array +08002236 w F .text 00000002 DMA1_Channel4_IRQHandler +0800214c g F .text 00000000 _mainCRTStartup +080028e4 g F .text 00000000 _init +080027a4 g F .text 0000001c BootActivate +08002268 w F .text 00000002 USART3_IRQHandler +00000000 w *UND* 00000000 __libc_fini_array +08002220 w F .text 00000002 RTC_IRQHandler +0800223c w F .text 00000002 DMA1_Channel7_IRQHandler +080021c0 g F .text 00000030 Reset_Handler +08002244 w F .text 00000002 CAN1_RX1_IRQHandler +0800267c g F .text 00000030 LedInit +08002670 g F .text 00000004 GPIO_SetBits +08002256 w F .text 00000002 TIM4_IRQHandler +00000000 w *UND* 00000000 __sf_fake_stderr +00000000 w *UND* 00000000 __deregister_frame_info +200000f0 g .heap 00000000 end +08002258 w F .text 00000002 I2C1_EV_IRQHandler +2000007c g .data 00000000 __data_end__ +080024e0 g F .text 000000bc RCC_GetClocksFreq +0800223a w F .text 00000002 DMA1_Channel6_IRQHandler +080023e4 g F .text 000000c8 USART_Init +200000eb g .bss 00000000 __bss_end__ +00000800 g *ABS* 00000000 __STACK_SIZE +08002254 w F .text 00000002 TIM3_IRQHandler +08002224 w F .text 00000002 RCC_IRQHandler +0800224e w F .text 00000002 TIM1_TRG_COM_IRQHandler +00000000 w *UND* 00000000 __call_exitprocs +08002230 w F .text 00000002 DMA1_Channel1_IRQHandler +08002218 w F .text 00000002 Default_Handler +0800214c g F .text 00000000 _start +0800226a w F .text 00000002 EXTI15_10_IRQHandler +00000000 w *UND* 00000000 software_init_hook +08002674 g F .text 00000004 GPIO_ResetBits +08002248 w F .text 00000002 EXTI9_5_IRQHandler +08002262 w F .text 00000002 SPI2_IRQHandler +00000000 w *UND* 00000000 __sf_fake_stdin +080028d4 g F .text 00000010 memset +0800220a w F .text 00000002 MemManage_Handler +08002000 g .text 000000f0 __isr_vector +080023d0 g F .text 00000014 main +08002210 w F .text 00000002 SVC_Handler +00000000 w *UND* 00000000 hardware_init_hook +200000f0 g .heap 00000000 __end__ +08002238 w F .text 00000002 DMA1_Channel5_IRQHandler +0800222e w F .text 00000002 EXTI4_IRQHandler +08002278 g F .text 0000000c TimerSet +08002242 w F .text 00000002 USB_LP_CAN1_RX0_IRQHandler +0800279c g F .text 00000008 BootComInit +080028f0 g F .text 00000000 _fini +08002240 w F .text 00000002 USB_HP_CAN1_TX_IRQHandler +00000000 w *UND* 00000000 atexit +08002234 w F .text 00000002 DMA1_Channel3_IRQHandler +20005000 g .bss 00000000 __StackTop +0800224c w F .text 00000002 TIM1_UP_IRQHandler +0800221a w F .text 00000002 WWDG_IRQHandler +080026ac g F .text 0000004c LedToggle +08002252 w F .text 00000002 TIM2_IRQHandler +0800224a w F .text 00000002 TIM1_BRK_IRQHandler +20005000 g *ABS* 00000000 __stack +08002228 w F .text 00000002 EXTI1_IRQHandler +0800226c w F .text 00000002 RTCAlarm_IRQHandler +20004800 g *ABS* 00000800 __StackLimit +08002266 w F .text 00000002 USART2_IRQHandler +08002860 g F .text 00000028 exit +0800225e w F .text 00000002 I2C2_ER_IRQHandler +08002232 w F .text 00000002 DMA1_Channel2_IRQHandler +00000000 w *UND* 00000000 __sf_fake_stdout +08002858 g F .text 00000008 BootComCheckActivationRequest +08002246 w F .text 00000002 CAN1_SCE_IRQHandler +08002222 w F .text 00000002 FLASH_IRQHandler +08002678 w F .text 00000002 _exit +0800220c w F .text 00000002 BusFault_Handler +08002264 w F .text 00000002 USART1_IRQHandler +0800225a w F .text 00000002 I2C1_ER_IRQHandler +080022b0 g F .text 0000000c TimerGet +00000000 w *UND* 00000000 _Jv_RegisterClasses +08002284 g F .text 0000002c TimerInit +00000000 w *UND* 00000000 __register_frame_info +0800226e w F .text 00000002 USBWakeUp_IRQHandler + + diff --git a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.srec b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.srec index ec75e138..1c9d8c34 100644 --- a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.srec +++ b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/bin/demoprog_nucleo_stm32f103rb.srec @@ -2,7 +2,7 @@ S027000062696E2F64656D6F70726F675F6E75636C656F5F73746D33326631303372622E73726563 S3150800200000500020C1210008072200080922000804 S315080020100B2200080D2200080F220008000000000D S315080020200000000000000000000000001122000867 -S315080020301322000800000000152200085525000894 +S31508002030132200080000000015220008BD2200082F S315080020401B2200081D2200081F2200082122000862 S315080020502322000825220008272200082922000832 S315080020602B2200082D2200082F2200083122000802 @@ -16,140 +16,141 @@ S315080020D063220008652200086722000869220008B2 S315080020E06B2200086D2200086F220008EE11AA551F S315080020F010B5054C237833B9044B13B10448AFF334 S3150800210000800123237010BD7C0000200000000021 -S31508002110FC280008084B10B51BB108490848AFF35E +S3150800211000290008084B10B51BB108490848AFF359 S3150800212000800848036803B910BD074B002BFBD095 S31508002130BDE81040184700BF0000000080000020DE -S31508002140FC2800087C00002000000000154B002B2E +S31508002140002900087C00002000000000154B002B29 S3150800215008BF134B9D46A3F5803A00218B460F46D0 -S315080021601348144A121A00F0B3FB0F4B002B00D089 +S315080021601348144A121A00F0B5FB0F4B002B00D087 S3150800217098470E4B002B00D09847002000210400FA S315080021800D000D48002802D00C48AFF3008000F07F -S3150800219079FB2000290000F0A5FA00F05FFB00BFDC +S315080021907BFB2000290000F01BF900F061FB00BF63 S315080021A000000800005000200000000000000000A9 S315080021B07C000020EB00002000000000000000006A S315080021C006498D460649074A074B9A42BEBF51F84B S315080021D0040B42F8040BF8E70448004700500020B7 -S315080021E008290008000000207C0000204D21000876 +S315080021E00C290008000000207C0000204D21000872 S315080021F01F49204A002301E041F8043B9142FBD3E2 -S3150800220000F070FAFEE7FEE7FEE7FEE7FEE7FEE708 +S3150800220000F0E6F8FEE7FEE7FEE7FEE7FEE7FEE794 S31508002210FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE788 S31508002220FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE778 S31508002230FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE768 S31508002240FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE758 S31508002250FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE748 S31508002260FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE738 -S315080022707C000020EB000020FEE700BFF0B4CB781E -S3150800228003F00F02154613F0100F01D08D78154391 -S315080022900B78E3B10668002316E001229A400C8801 -S315080022A032EA04040FD19C000F27A74026EA070646 -S315080022B005FA04F42643CC78282C01D1426102E0C1 -S315080022C0482C00D102610133072BE6D906600B883A -S315080022D0FF2B1ED94668002318E003F108040122E3 -S315080022E0A2400C8832EA04040FD19C000F27A740AD -S315080022F026EA070605FA04F42643CC78282C00D1EA -S315080023004261CC78482C00D102610133072BE4D90D -S315080023104660F0BC704700BF016170474161704775 -S3150800232030B587B004460D46038A9BB2CA8823F4A3 -S3150800233040531343038283899BB28A880989688933 -S315080023400A43024323F4B05323F00C031343A38137 -S31508002350A38A9BB2AA8923F440731343A38201A8D4 -S3150800236000F05CF81E4B9C4201D1049A00E0039AE7 -S31508002370A38913F4004F08D002EB820202EB820213 -S3150800238029684900B2FBF1F107E002EB820202EB91 -S31508002390820229688900B2FBF1F1124BA3FB0123E3 -S315080023A05B091B011A09642000FB1212A18911F4AA -S315080023B0004F08D0D20032320A49A1FB0212C2F3FA -S315080023C042121A4307E0120132320649A1FB0212F1 -S315080023D0C2F343121A4392B2228107B030BD00BF3E -S315080023E0003801401F85EB5129B183899BB243F41C -S315080023F000538381704783899BB223F400539BB2B1 -S31508002400838170478088C0F30800704703881942A3 -S3150800241001D0012070470020704700BF10B4294B37 -S315080024205B6803F00C03042B05D0082B06D013BBFE -S31508002430254B036021E0244B03601EE0214A5368C4 -S315080024405268C3F38343023312F4803F04D11F4A10 -S3150800245002FB03F3036010E01A4A526812F4003FC5 -S3150800246004D01A4A02FB03F3036006E0164A02FB8D -S3150800247003F3036001E0144B036012494B68C3F38E -S315080024800313134CE35CDAB20368D34043604A682B -S31508002490C2F30222A25CD2B223FA02F282604A682E -S315080024A0C2F3C222A25CD2B2D340C3604A68C2F366 -S315080024B0813208498A5CD2B2B3FBF2F3036110BCDD -S315080024C0704700BF0010024000127A0000093D0064 -S315080024D0040000200000002021B1054B9A69104332 -S315080024E098617047024A936923EA00009061704731 -S315080024F00010024021B1054BDA691043D8617047D4 -S31508002500024AD36923EA0000D061704700100240EE -S31508002510014B1860704700BF9800002008B5074BAC -S31508002520074A5A60F021074A82F82310002098606B -S3150800253007221A60FFF7ECFF08BD00BF10E000E0B5 -S315080025403F19010000ED00E0014B1868704700BF15 -S3150800255098000020024A136801331360704700BFD1 -S315080025609800002000B583B001210420FFF7B4FFCE -S315080025702023ADF8043003238DF8063010238DF898 -S31508002580073001A90248FFF779FE03B05DF804FB9E -S315080025900008014010B5FFF7D7FF0E4B1B68C31A9A -S315080025A0B3F5FA7F14D304460B4B1B783BB90122CB -S315080025B0094B1A7020210948FFF7AEFE06E00022F3 -S315080025C0054B1A7020210548FFF7A8FE014B1C6031 -S315080025D010BD00BF9C000020A0000020000801409C -S315080025E000B583B000230193009303F1804303F5FC -S315080025F004331A6842F001021A605968364A0A40DA -S315080026005A601A6822F0847222F480321A601A68B4 -S3150800261022F480221A605A6822F4FE025A604FF4A5 -S315080026201F029A601A6842F480321A602B4B1B68A4 -S3150800263003F400330093019B01330193009B23B9F4 -S31508002640019A40F2DC539A42F0D1244B1B6813F4EA -S31508002650003F00D1FEE7224B1A6842F010021A60CA -S315080026601A6822F003021A601A6842F002021A6017 -S31508002670A3F580535A685A605A6842F400525A6061 -S315080026805A6842F480625A605A6822F47C125A6088 -S315080026905A6842F4E8125A601A6842F080721A6060 -S315080026A00E4B1B6813F0007FFAD00C4B5A6822F0C9 -S315080026B003025A605A6842F002025A60074B5B6886 -S315080026C003F00C03082BF9D1FFF74CFFFFF726FFA1 -S315080026D003B05DF804FB00BF0000FFF800100240DD -S315080026E00020024008B5FFF77BFF00F057F8FFF718 -S315080026F051FF00F0AFF8FAE730B587B001214FF483 -S315080027000030FFF7F7FE01210520FFF7E5FE182345 +S315080022707C000020EB000020014B1860704700BF6F +S315080022809800002008B5074B074A5A60F021074A0C +S3150800229082F823100020986007221A60FFF7ECFFE7 +S315080022A008BD00BF10E000E03F19010000ED00E0A6 +S315080022B0014B1868704700BF98000020024A13684F +S315080022C001331360704700BF9800002000B583B043 +S315080022D000230193009303F1804303F504331A683E +S315080022E042F001021A605968364A0A405A601A686A +S315080022F022F0847222F480321A601A6822F480224C +S315080023001A605A6822F4FE025A604FF41F029A6055 +S315080023101A6842F480321A602B4B1B6803F40033A8 +S315080023200093019B01330193009B23B9019A40F264 +S31508002330DC539A42F0D1244B1B6813F4003F00D1BA +S31508002340FEE7224B1A6842F010021A601A6822F059 +S3150800235003021A601A6842F002021A60A3F5805353 +S315080023605A685A605A6842F400525A605A6842F4E7 +S3150800237080625A605A6822F47C125A605A6842F49B +S31508002380E8125A601A6842F080721A600E4B1B688F +S3150800239013F0007FFAD00C4B5A6822F003025A60F9 +S315080023A05A6842F002025A60074B5B6803F00C0356 +S315080023B0082BF9D100F062F9FFF764FF03B05DF866 +S315080023C004FB00BF0000FFF8001002400020024096 +S315080023D008B5FFF77BFF00F0E1F900F067F900F0B8 +S315080023E03BFAFAE730B587B004460D46038A9BB236 +S315080023F0CA8823F440531343038283899BB28A888D +S31508002400098968890A43024323F4B05323F00C036D +S315080024101343A381A38A9BB2AA8923F44073134367 +S31508002420A38201A800F05CF81E4B9C4201D1049AD5 +S3150800243000E0039AA38913F4004F08D002EB820246 +S3150800244002EB820229684900B2FBF1F107E002EBD0 +S31508002450820202EB820229688900B2FBF1F1124B73 +S31508002460A3FB01235B091B011A09642000FB121256 +S31508002470A18911F4004F08D0D20032320A49A1FBD3 +S315080024800212C2F342121A4307E012013232064917 +S31508002490A1FB0212C2F343121A4392B2228107B079 +S315080024A030BD00BF003801401F85EB5129B1838933 +S315080024B09BB243F400538381704783899BB223F40C +S315080024C000539BB2838170478088C0F30800704729 +S315080024D00388194201D0012070470020704700BFC9 +S315080024E010B4294B5B6803F00C03042B05D0082BAA +S315080024F006D013BB254B036021E0244B03601EE086 +S31508002500214A53685268C3F38343023312F4803F67 +S3150800251004D11F4A02FB03F3036010E01A4A52680B +S3150800252012F4003F04D01A4A02FB03F3036006E0E4 +S31508002530164A02FB03F3036001E0144B03601249D9 +S315080025404B68C3F30313134CE35CDAB20368D34056 +S3150800255043604A68C2F30222A25CD2B223FA02F2AC +S3150800256082604A68C2F3C222A25CD2B2D340C36078 +S315080025704A68C2F3813208498A5CD2B2B3FBF2F3E5 +S31508002580036110BC704700BF0010024000127A00B9 +S3150800259000093D00040000200000002021B1054B81 +S315080025A09A69104398617047024A936923EA0000C2 +S315080025B0906170470010024021B1054BDA6910435B +S315080025C0D8617047024AD36923EA0000D061704790 +S315080025D000100240F0B4CB7803F00F02154613F052 +S315080025E0100F01D08D7815430B78E3B106680023E8 +S315080025F016E001229A400C8832EA04040FD19C00A6 +S315080026000F27A74026EA070605FA04F42643CC78DE +S31508002610282C01D1426102E0482C00D10261013325 +S31508002620072BE6D906600B88FF2B1ED946680023C0 +S3150800263018E003F108040122A2400C8832EA0404D7 +S315080026400FD19C000F27A74026EA070605FA04F4CF +S315080026502643CC78282C00D14261CC78482C00D16E +S3150800266002610133072BE4D94660F0BC704700BF0E +S315080026700161704741617047FEE700BF00B583B04E +S3150800268001210420FFF78AFF2023ADF80430032335 +S315080026908DF8063010238DF8073001A90248FFF798 +S315080026A099FF03B05DF804FB0008014010B5FFF779 +S315080026B0FFFD0E4B1B68C31AB3F5FA7F14D3044605 +S315080026C00B4B1B783BB90122094B1A70202109488C +S315080026D0FFF7CEFF06E00022054B1A7020210548B9 +S315080026E0FFF7C8FF014B1C6010BD00BF9C0000200F +S315080026F0A00000200008014030B587B001214FF442 +S315080027000030FFF759FF01210520FFF747FF18237F S315080027108DF817300425ADF8145003238DF81630BC -S31508002720144C05A92046FFF7A9FD8DF81750082374 -S31508002730ADF8143005A92046FFF7A0FD4FF4614314 +S31508002720144C05A92046FFF755FF8DF817500823C6 +S31508002730ADF8143005A92046FFF74CFF4FF4614366 S3150800274001930023ADF80830ADF80A30ADF80C3027 S31508002750ADF810300C23ADF80E30A4F544440DEB5B -S3150800276005012046FFF7DCFD01212046FFF73CFE68 +S3150800276005012046FFF73EFE01212046FFF79EFEA3 S3150800277007B030BD0008014010B5044620210648C0 -S31508002780FFF744FE012805D10348FFF73BFE2070FA +S31508002780FFF7A6FE012805D10348FFF79DFE207036 S31508002790012010BD002010BD0044004008B5FFF719 S315080027A0ABFF08BD0449CA6802F4E062034B134351 S315080027B0CB60BFF34F8FFEE700ED00E00400FA059B -S315080027C008B5204B1B789BB91F48FFF7D5FF012892 -S315080027D036D11D4B1B78002B32D0FFF7B5FE1B4BAD -S315080027E018600122174B1A700022194B1A7008BD7F -S315080027F0174B1B78013314481844FFF7BDFF01280F -S3150800280014D1134A13780133DBB213700E4A1278C7 -S31508002810934215D100220B4B1A700B4B5B78FF2B9A -S315080028200ED1094B9B785BB9FFF7BCFFFFF78CFE0F -S31508002830064B1B686433984202D90022014B1A7072 -S3150800284008BD00BFEA000020A8000020A400002060 -S31508002850E900002008B5FFF7B3FF08BD08B5074B28 -S31508002860044613B10021AFF30080054B1868836A4C -S3150800287003B198472046FFF7FFFC00BF00000000A1 -S31508002880F82800080E4B70B51E460E4C0025E41AB3 -S31508002890A410A54204D056F8253098470135F8E724 -S315080028A000F01EF8084B094C1E46E41AA410002531 -S315080028B0A54204D056F8253098470135F8E770BD8B -S315080028C074000020740000207400002078000020A6 -S315080028D003460244934202D003F8011BFAE7704705 -S315080028E0F8B500BFF8BC08BC9E467047F8B500BFEF -S315080028F0F8BC08BC9E467047140000200000000083 -S30D080029004CF8FF7F01000000FE -S315080029080204060800000000010203040102030489 -S315080029180607080900000000000000000000000083 -S315080029280000000000000000000000000000000091 -S315080029380000000000000000000000000000000081 -S315080029480000000000000000000000000000000071 -S315080029580000000000000000000000000000000061 -S315080029680000000000000000000000000000000051 -S311080029780000000015210008F1200008EE +S315080027C008B5214B1B78ABB92048FFF7D5FF012880 +S315080027D038D11E4B1B78013BDBB23F2B32D8FFF7B3 +S315080027E067FD1B4B18600122174B1A700022194B04 +S315080027F01A7008BD174B1B78013314481844FFF7A5 +S31508002800BBFF012814D1134A13780133DBB21370C6 +S315080028100E4A1278934215D100220B4B1A700B4BB5 +S315080028205B78FF2B0ED1094B9B785BB9FFF7BAFF94 +S31508002830FFF73EFD064B1B686433984202D9002217 +S31508002840014B1A7008BD00BFEA000020A80000204E +S31508002850A4000020E900002008B5FFF7B1FF08BD75 +S3150800286008B5074B044613B10021AFF30080054BAA +S315080028701868836A03B198472046FFF7FDFE00BF34 +S3150800288000000000FC2800080E4B70B51E460E4CD2 +S315080028900025E41AA410A54204D056F82530984716 +S315080028A00135F8E700F01EF8084B094C1E46E41AF5 +S315080028B0A4100025A54204D056F8253098470135BE +S315080028C0F8E770BD74000020740000207400002032 +S315080028D07800002003460244934202D003F8011B05 +S315080028E0FAE77047F8B500BFF8BC08BC9E467047C3 +S315080028F0F8B500BFF8BC08BC9E4670471400002017 +S3090800290000000000C5 +S30D0800290448F8FF7F01000000FE +S3150800290C0204060800000000010203040102030485 +S3150800291C060708090000000000000000000000007F +S3150800292C000000000000000000000000000000008D +S3150800293C000000000000000000000000000000007D +S3150800294C000000000000000000000000000000006D +S3150800295C000000000000000000000000000000005D +S3150800296C000000000000000000000000000000004D +S3110800297C0000000015210008F1200008EA S70508002000D2 diff --git a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Nucleo_F103RB_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.elf b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.elf index 657bf1bf..358542fa 100644 Binary files a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.elf and b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.elf differ diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.map b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.map index 7223208a..ab4d3b0d 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.map +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.map @@ -11,7 +11,7 @@ Program Header: LOAD off 0x00000000 vaddr 0x08000000 paddr 0x08000000 align 2**16 filesz 0x000045d0 memsz 0x000045d0 flags r-x LOAD off 0x00010000 vaddr 0x20000000 paddr 0x080045d0 align 2**16 - filesz 0x00000068 memsz 0x00000090 flags rw- + filesz 0x00000068 memsz 0x0000008d flags rw- private flags = 5000200: [Version5 EABI] [soft-float ABI] Sections: @@ -22,7 +22,7 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, DATA 2 .data 00000068 20000000 080045d0 00010000 2**2 CONTENTS, ALLOC, LOAD, DATA - 3 .bss 00000028 20000068 08004638 00010068 2**2 + 3 .bss 00000025 20000068 08004638 00010068 2**2 ALLOC 4 .heap 00000800 20000090 20000090 00010068 2**3 CONTENTS, READONLY @@ -40,15 +40,15 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY, DEBUGGING 11 .debug_aranges 00000290 00000000 00000000 000155e8 2**3 CONTENTS, READONLY, DEBUGGING - 12 .debug_ranges 00000210 00000000 00000000 00015878 2**0 + 12 .debug_loc 00000c49 00000000 00000000 00015878 2**0 CONTENTS, READONLY, DEBUGGING - 13 .debug_macro 0000db31 00000000 00000000 00015a88 2**0 + 13 .debug_ranges 00000210 00000000 00000000 000164c1 2**0 CONTENTS, READONLY, DEBUGGING - 14 .debug_str 00050aaa 00000000 00000000 000235b9 2**0 + 14 .debug_macro 0000db31 00000000 00000000 000166d1 2**0 CONTENTS, READONLY, DEBUGGING - 15 .debug_frame 00000520 00000000 00000000 00074064 2**2 + 15 .debug_str 00050aaf 00000000 00000000 00024202 2**0 CONTENTS, READONLY, DEBUGGING - 16 .debug_loc 00000c49 00000000 00000000 00074584 2**0 + 16 .debug_frame 00000520 00000000 00000000 00074cb4 2**2 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 08004000 l d .text 00000000 .text @@ -63,11 +63,11 @@ SYMBOL TABLE: 00000000 l d .debug_info 00000000 .debug_info 00000000 l d .debug_abbrev 00000000 .debug_abbrev 00000000 l d .debug_aranges 00000000 .debug_aranges +00000000 l d .debug_loc 00000000 .debug_loc 00000000 l d .debug_ranges 00000000 .debug_ranges 00000000 l d .debug_macro 00000000 .debug_macro 00000000 l d .debug_str 00000000 .debug_str 00000000 l d .debug_frame 00000000 .debug_frame -00000000 l d .debug_loc 00000000 .debug_loc 00000000 l df *ABS* 00000000 obj/startup_stm32f10x_md.o 00000800 l *ABS* 00000000 Stack_Size 00000800 l *ABS* 00000000 Heap_Size @@ -83,16 +83,16 @@ SYMBOL TABLE: 2000006c l .bss 00000000 object.8608 20000060 l O .data 00000000 __frame_dummy_init_array_entry 00000000 l df *ABS* 00000000 /opt/gcc-arm-none-eabi-5_4-2016q3/bin/../lib/gcc/arm-none-eabi/5.4.1/../../../../arm-none-eabi/lib/armv7-m/crt0.o -00000000 l df *ABS* 00000000 main.c -08004278 l F .text 00000104 Init -00000000 l df *ABS* 00000000 led.c -20000084 l O .bss 00000004 timer_counter_last.6544 -20000088 l O .bss 00000001 led_toggle_state.6543 00000000 l df *ABS* 00000000 timer.c -2000008c l O .bss 00000004 millisecond_counter +20000084 l O .bss 00000004 millisecond_counter +00000000 l df *ABS* 00000000 main.c +080042cc l F .text 00000104 Init 00000000 l df *ABS* 00000000 stm32f10x_rcc.c 00000000 l df *ABS* 00000000 stm32f10x_gpio.c 00000000 l df *ABS* 00000000 _exit.c +00000000 l df *ABS* 00000000 led.c +20000088 l O .bss 00000004 timer_counter_last.6544 +2000008c l O .bss 00000001 led_toggle_state.6543 00000000 l df *ABS* 00000000 exit.c 00000000 l df *ABS* 00000000 init.c 00000000 l df *ABS* 00000000 memset.c @@ -114,7 +114,7 @@ SYMBOL TABLE: 20000000 g .data 00000000 __data_start__ 08004250 w F .text 00000002 TIM1_CC_IRQHandler 08004208 w F .text 00000002 HardFault_Handler -08004450 g F .text 00000010 SysTick_Handler +080042bc g F .text 00000010 SysTick_Handler 0800421c w F .text 00000002 PVD_IRQHandler 08004214 w F .text 00000002 PendSV_Handler 08004206 w F .text 00000002 NMI_Handler @@ -124,9 +124,9 @@ SYMBOL TABLE: 08004226 w F .text 00000002 EXTI0_IRQHandler 0800425c w F .text 00000002 I2C2_EV_IRQHandler 0800420e w F .text 00000002 UsageFault_Handler -08004460 g F .text 0000001c RCC_APB2PeriphClockCmd +080043dc g F .text 0000001c RCC_APB2PeriphClockCmd 0800423e w F .text 00000002 ADC1_2_IRQHandler -0800447c g F .text 0000009a GPIO_Init +080043f8 g F .text 0000009a GPIO_Init 20000890 g .heap 00000000 __HeapLimit 20000068 g .bss 00000000 __bss_start__ 08004260 w F .text 00000002 SPI1_IRQHandler @@ -143,8 +143,8 @@ SYMBOL TABLE: 0800423c w F .text 00000002 DMA1_Channel7_IRQHandler 080041c0 g F .text 00000030 Reset_Handler 08004244 w F .text 00000002 CAN1_RX1_IRQHandler -08004388 g F .text 00000034 LedInit -08004518 g F .text 00000004 GPIO_SetBits +080044a0 g F .text 00000034 LedInit +08004494 g F .text 00000004 GPIO_SetBits 08004256 w F .text 00000002 TIM4_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stderr 00000000 w *UND* 00000000 __deregister_frame_info @@ -152,7 +152,7 @@ SYMBOL TABLE: 08004258 w F .text 00000002 I2C1_EV_IRQHandler 20000068 g .data 00000000 __data_end__ 0800423a w F .text 00000002 DMA1_Channel6_IRQHandler -20000090 g .bss 00000000 __bss_end__ +2000008d g .bss 00000000 __bss_end__ 00000800 g *ABS* 00000000 __STACK_SIZE 08004254 w F .text 00000002 TIM3_IRQHandler 08004224 w F .text 00000002 RCC_IRQHandler @@ -163,20 +163,20 @@ SYMBOL TABLE: 0800414c g F .text 00000000 _start 0800426a w F .text 00000002 EXTI15_10_IRQHandler 00000000 w *UND* 00000000 software_init_hook -0800451c g F .text 00000004 GPIO_ResetBits +08004498 g F .text 00000004 GPIO_ResetBits 08004248 w F .text 00000002 EXTI9_5_IRQHandler 08004262 w F .text 00000002 SPI2_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stdin 08004598 g F .text 00000010 memset 0800420a w F .text 00000002 MemManage_Handler 08004000 g .text 000000f0 __isr_vector -0800437c g F .text 0000000c main +080043d0 g F .text 0000000c main 08004210 w F .text 00000002 SVC_Handler 00000000 w *UND* 00000000 hardware_init_hook 20000090 g .heap 00000000 __end__ 08004238 w F .text 00000002 DMA1_Channel5_IRQHandler 0800422e w F .text 00000002 EXTI4_IRQHandler -0800440c g F .text 0000000c TimerSet +08004278 g F .text 0000000c TimerSet 08004242 w F .text 00000002 USB_LP_CAN1_RX0_IRQHandler 080045b4 g F .text 00000000 _fini 08004240 w F .text 00000002 USB_HP_CAN1_TX_IRQHandler @@ -185,7 +185,7 @@ SYMBOL TABLE: 20005000 g .bss 00000000 __StackTop 0800424c w F .text 00000002 TIM1_UP_IRQHandler 0800421a w F .text 00000002 WWDG_IRQHandler -080043bc g F .text 00000050 LedToggle +080044d4 g F .text 00000050 LedToggle 08004252 w F .text 00000002 TIM2_IRQHandler 0800424a w F .text 00000002 TIM1_BRK_IRQHandler 20005000 g *ABS* 00000000 __stack @@ -199,13 +199,13 @@ SYMBOL TABLE: 00000000 w *UND* 00000000 __sf_fake_stdout 08004246 w F .text 00000002 CAN1_SCE_IRQHandler 08004222 w F .text 00000002 FLASH_IRQHandler -08004520 w F .text 00000002 _exit +0800449c w F .text 00000002 _exit 0800420c w F .text 00000002 BusFault_Handler 08004264 w F .text 00000002 USART1_IRQHandler 0800425a w F .text 00000002 I2C1_ER_IRQHandler -08004444 g F .text 0000000c TimerGet +080042b0 g F .text 0000000c TimerGet 00000000 w *UND* 00000000 _Jv_RegisterClasses -08004418 g F .text 0000002c TimerInit +08004284 g F .text 0000002c TimerInit 00000000 w *UND* 00000000 __register_frame_info 0800426e w F .text 00000002 USBWakeUp_IRQHandler diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.srec b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.srec index 8f52beb6..2b94eaf3 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.srec +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/bin/demoprog_olimex_stm32h103.srec @@ -2,7 +2,7 @@ S025000062696E2F64656D6F70726F675F6F6C696D65785F73746D3332683130332E7372656339 S3150800400000500020C1410008074200080942000884 S315080040100B4200080D4200080F420008000000008D S315080040200000000000000000000000001142000827 -S315080040301342000800000000154200085144000819 +S31508004030134200080000000015420008BD420008AF S315080040401B4200081D4200081F42000821420008C2 S315080040502342000825420008274200082942000892 S315080040602B4200082D4200082F4200083142000862 @@ -24,66 +24,66 @@ S3150800415008BF134B9D46A3F5803A00218B460F46B0 S315080041601348144A121A00F017FA0F4B002B00D006 S3150800417098470E4B002B00D09847002000210400DA S315080041800D000D48002802D00C48AFF3008000F05F -S31508004190DDF92000290000F0F1F800F0C3F900BFAE +S31508004190DDF92000290000F01BF900F0C3F900BF83 S315080041A00000080000500020000000000000000089 -S315080041B068000020900000200000000000000000B9 +S315080041B0680000208D0000200000000000000000BC S315080041C006498D460649074A074B9A42BEBF51F82B S315080041D0040B42F8040BF8E7044800470050002097 S315080041E0D045000800000020680000204D41000866 S315080041F01F49204A002301E041F8043B9142FBD3C2 -S3150800420000F0BCF8FEE7FEE7FEE7FEE7FEE7FEE79E +S3150800420000F0E6F8FEE7FEE7FEE7FEE7FEE7FEE774 S31508004210FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE768 S31508004220FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE758 S31508004230FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE748 S31508004240FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE738 S31508004250FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE728 S31508004260FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE718 -S31508004270680000209000002000B583B00023019359 -S31508004280009303F1804303F504331A6842F00102F0 -S315080042901A605968364A0A405A601A6822F08472C7 -S315080042A022F480321A601A6822F480221A605A6848 -S315080042B022F4FE025A604FF41F029A601A6842F40A -S315080042C080321A602B4B1B6803F400330093019B62 -S315080042D001330193009B23B9019A40F2DC539A42B9 -S315080042E0F0D1244B1B6813F4003F00D1FEE7224BA4 -S315080042F01A6842F010021A601A6822F003021A605D -S315080043001A6842F002021A60A3F580535A685A6086 -S315080043105A6842F400525A605A6842F480625A60F7 -S315080043205A6822F47C125A605A6842F4E8125A60B3 -S315080043301A6842F080721A600E4B1B6813F0007FF1 -S31508004340FAD00C4B5A6822F003025A605A6842F0B7 -S3150800435002025A60074B5B6803F00C03082BF9D17D -S3150800436000F012F800F058F803B05DF804FB00BF3F -S315080043700000FFF8001002400020024008B5FFF7D1 -S315080043807BFF00F01BF8FCE700B583B00121102085 -S3150800439000F066F84FF48053ADF8043003238DF827 -S315080043A0063010238DF8073001A9034800F066F897 -S315080043B003B05DF804FB00BF0010014010B500F023 -S315080043C041F80F4B1B68C31AB3F5FA7F16D3044698 -S315080043D00C4B1B7843B901220A4B1A704FF48051D3 -S315080043E0094800F09BF807E00022064B1A704FF4C4 -S315080043F08051054800F090F8014B1C6010BD00BFC5 -S31508004400840000208800002000100140014B18603D -S31508004410704700BF8C00002008B5074B074A5A6052 -S31508004420F021074A82F823100020986007221A60B4 -S31508004430FFF7ECFF08BD00BF10E000E03F190100E0 -S3150800444000ED00E0014B1868704700BF8C000020A3 -S31508004450024A136801331360704700BF8C000020BE -S3150800446021B1054B9A69104398617047024A9369CE -S3150800447023EA00009061704700100240F0B4CB7840 -S3150800448003F00F02154613F0100F01D08D7815436F -S315080044900B78E3B10668002316E001229A400C88DF -S315080044A032EA04040FD19C000F27A74026EA070624 -S315080044B005FA04F42643CC78282C01D1426102E09F -S315080044C0482C00D102610133072BE6D906600B8818 -S315080044D0FF2B1ED94668002318E003F108040122C1 -S315080044E0A2400C8832EA04040FD19C000F27A7408B -S315080044F026EA070605FA04F42643CC78282C00D1C8 -S315080045004261CC78482C00D102610133072BE4D9EB -S315080045104660F0BC704700BF016170474161704753 -S31508004520FEE700BF08B5074B044613B10021AFF3F9 +S31508004270680000208D000020014B1860704700BFC1 +S315080042808400002008B5074B074A5A60F021074A00 +S3150800429082F823100020986007221A60FFF7ECFFC7 +S315080042A008BD00BF10E000E03F19010000ED00E086 +S315080042B0014B1868704700BF84000020024A136843 +S315080042C001331360704700BF8400002000B583B037 +S315080042D000230193009303F1804303F504331A681E +S315080042E042F001021A605968364A0A405A601A684A +S315080042F022F0847222F480321A601A6822F480222C +S315080043001A605A6822F4FE025A604FF41F029A6035 +S315080043101A6842F480321A602B4B1B6803F4003388 +S315080043200093019B01330193009B23B9019A40F244 +S31508004330DC539A42F0D1244B1B6813F4003F00D19A +S31508004340FEE7224B1A6842F010021A601A6822F039 +S3150800435003021A601A6842F002021A60A3F5805333 +S315080043605A685A605A6842F400525A605A6842F4C7 +S3150800437080625A605A6822F47C125A605A6842F47B +S31508004380E8125A601A6842F080721A600E4B1B686F +S3150800439013F0007FFAD00C4B5A6822F003025A60D9 +S315080043A05A6842F002025A60074B5B6803F00C0336 +S315080043B0082BF9D100F074F8FFF764FF03B05DF835 +S315080043C004FB00BF0000FFF8001002400020024076 +S315080043D008B5FFF77BFF00F07DF8FCE721B1054B38 +S315080043E09A69104398617047024A936923EA000064 +S315080043F09061704700100240F0B4CB7803F00F02CA +S31508004400154613F0100F01D08D7815430B78E3B1DC +S315080044100668002316E001229A400C8832EA040452 +S315080044200FD19C000F27A74026EA070605FA04F4D1 +S315080044302643CC78282C01D1426102E0482C00D1D1 +S3150800444002610133072BE6D906600B88FF2B1ED9BC +S315080044504668002318E003F108040122A2400C88EC +S3150800446032EA04040FD19C000F27A74026EA070664 +S3150800447005FA04F42643CC78282C00D14261CC787E +S31508004480482C00D102610133072BE4D94660F0BC01 +S31508004490704700BF0161704741617047FEE700BF82 +S315080044A000B583B001211020FFF798FF4FF4805321 +S315080044B0ADF8043003238DF8063010238DF8073045 +S315080044C001A90348FFF798FF03B05DF804FB00BF96 +S315080044D00010014010B5FFF7EBFE0F4B1B68C31A1F +S315080044E0B3F5FA7F16D304460C4B1B7843B9012261 +S315080044F00A4B1A704FF480510948FFF7CDFF07E0C1 +S315080045000022064B1A704FF480510548FFF7C2FF88 +S31508004510014B1C6010BD00BF880000208C000020E5 +S315080045200010014008B5074B044613B10021AFF34C S315080045300080054B1868836A03B198472046FFF741 -S31508004540EFFF00BF00000000C04500080E4B70B525 +S31508004540ADFF00BF00000000C04500080E4B70B567 S315080045501E460E4C0025E41AA410A54204D056F8AF S31508004560253098470135F8E700F01EF8084B094C46 S315080045701E46E41AA4100025A54204D056F8253094 diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32H103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Crossworks/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.elf b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.elf index 4d5ca3a8..cb9f1530 100644 Binary files a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.elf and b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.elf differ diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.map b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.map index b7e077d9..b3526951 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.map +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.map @@ -6,23 +6,23 @@ EXEC_P, HAS_SYMS, D_PAGED start address 0x08006000 Program Header: -0x70000001 off 0x00006e7c vaddr 0x08006e7c paddr 0x08006e7c align 2**2 +0x70000001 off 0x00006e90 vaddr 0x08006e90 paddr 0x08006e90 align 2**2 filesz 0x00000008 memsz 0x00000008 flags r-- LOAD off 0x00000000 vaddr 0x08000000 paddr 0x08000000 align 2**16 - filesz 0x00006e84 memsz 0x00006e84 flags r-x - LOAD off 0x00010000 vaddr 0x20000000 paddr 0x08006e84 align 2**16 - filesz 0x0000007c memsz 0x000000ec flags rw- + filesz 0x00006e98 memsz 0x00006e98 flags r-x + LOAD off 0x00010000 vaddr 0x20000000 paddr 0x08006e98 align 2**16 + filesz 0x0000007c memsz 0x000000eb flags rw- private flags = 5000200: [Version5 EABI] [soft-float ABI] Sections: Idx Name Size VMA LMA File off Algn - 0 .text 00000e7c 08006000 08006000 00006000 2**2 + 0 .text 00000e90 08006000 08006000 00006000 2**2 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 .ARM.exidx 00000008 08006e7c 08006e7c 00006e7c 2**2 + 1 .ARM.exidx 00000008 08006e90 08006e90 00006e90 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 .data 0000007c 20000000 08006e84 00010000 2**2 + 2 .data 0000007c 20000000 08006e98 00010000 2**2 CONTENTS, ALLOC, LOAD, DATA - 3 .bss 00000070 2000007c 08006f00 0001007c 2**2 + 3 .bss 0000006f 2000007c 08006f14 0001007c 2**2 ALLOC 4 .heap 00000800 200000f0 200000f0 00010080 2**3 CONTENTS, READONLY @@ -32,27 +32,27 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY 7 .comment 0000006e 00000000 00000000 000110a9 2**0 CONTENTS, READONLY - 8 .debug_line 00003224 00000000 00000000 00011117 2**0 + 8 .debug_line 00003232 00000000 00000000 00011117 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_info 0000452e 00000000 00000000 0001433b 2**0 + 9 .debug_info 0000453e 00000000 00000000 00014349 2**0 CONTENTS, READONLY, DEBUGGING - 10 .debug_abbrev 00000faa 00000000 00000000 00018869 2**0 + 10 .debug_abbrev 00000fb9 00000000 00000000 00018887 2**0 CONTENTS, READONLY, DEBUGGING - 11 .debug_aranges 000004d8 00000000 00000000 00019818 2**3 + 11 .debug_aranges 000004d8 00000000 00000000 00019840 2**3 CONTENTS, READONLY, DEBUGGING - 12 .debug_loc 00002124 00000000 00000000 00019cf0 2**0 + 12 .debug_loc 00002143 00000000 00000000 00019d18 2**0 CONTENTS, READONLY, DEBUGGING - 13 .debug_ranges 00000428 00000000 00000000 0001be14 2**0 + 13 .debug_ranges 00000428 00000000 00000000 0001be5b 2**0 CONTENTS, READONLY, DEBUGGING - 14 .debug_macro 0000e746 00000000 00000000 0001c23c 2**0 + 14 .debug_macro 0000e746 00000000 00000000 0001c283 2**0 CONTENTS, READONLY, DEBUGGING - 15 .debug_str 00051cfc 00000000 00000000 0002a982 2**0 + 15 .debug_str 00051d10 00000000 00000000 0002a9c9 2**0 CONTENTS, READONLY, DEBUGGING - 16 .debug_frame 00000a30 00000000 00000000 0007c680 2**2 + 16 .debug_frame 00000a30 00000000 00000000 0007c6dc 2**2 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 08006000 l d .text 00000000 .text -08006e7c l d .ARM.exidx 00000000 .ARM.exidx +08006e90 l d .ARM.exidx 00000000 .ARM.exidx 20000000 l d .data 00000000 .data 2000007c l d .bss 00000000 .bss 200000f0 l d .heap 00000000 .heap @@ -75,7 +75,7 @@ SYMBOL TABLE: 080061fc l .text 00000000 .fill_zero_bss 080061f8 l .text 00000000 .loop_zero_bss 00000000 l df *ABS* 00000000 crtstuff.c -08006e78 l O .text 00000000 __EH_FRAME_BEGIN__ +08006e8c l O .text 00000000 __EH_FRAME_BEGIN__ 080060f0 l F .text 00000000 __do_global_dtors_aux 2000007c l .bss 00000000 completed.8603 20000078 l O .data 00000000 __do_global_dtors_aux_fini_array_entry @@ -83,32 +83,32 @@ SYMBOL TABLE: 20000080 l .bss 00000000 object.8608 20000074 l O .data 00000000 __frame_dummy_init_array_entry 00000000 l df *ABS* 00000000 /opt/gcc-arm-none-eabi-5_4-2016q3/bin/../lib/gcc/arm-none-eabi/5.4.1/../../../../arm-none-eabi/lib/armv7-m/crt0.o -00000000 l df *ABS* 00000000 boot.c -08006278 l F .text 00000058 CanGetSpeedConfig -080062d0 l F .text 00000080 BootComUartInit -08006350 l F .text 000000fc BootComCanInit -0800644c l F .text 00000024 UartReceiveByte -08006498 l F .text 00000094 BootComUartCheckActivationRequest -0800652c l F .text 00000040 BootComCanCheckActivationRequest -20000098 l O .bss 00000004 xcpCtoRxStartTime.6574 -2000009c l O .bss 00000041 xcpCtoReqPacket.6571 -200000dd l O .bss 00000001 xcpCtoRxLength.6572 -200000de l O .bss 00000001 xcpCtoRxInProgress.6573 -08006e50 l O .text 00000024 canTiming -00000000 l df *ABS* 00000000 main.c -08006578 l F .text 00000104 Init -00000000 l df *ABS* 00000000 led.c -200000e0 l O .bss 00000004 timer_counter_last.6552 -200000e4 l O .bss 00000001 led_toggle_state.6551 00000000 l df *ABS* 00000000 timer.c -200000e8 l O .bss 00000004 millisecond_counter -00000000 l df *ABS* 00000000 stm32f10x_can.c +20000098 l O .bss 00000004 millisecond_counter +00000000 l df *ABS* 00000000 main.c +080062cc l F .text 00000104 Init +00000000 l df *ABS* 00000000 stm32f10x_usart.c 00000000 l df *ABS* 00000000 stm32f10x_rcc.c 20000000 l O .data 00000004 ADCPrescTable 20000004 l O .data 00000010 APBAHBPrescTable -00000000 l df *ABS* 00000000 stm32f10x_usart.c 00000000 l df *ABS* 00000000 stm32f10x_gpio.c +00000000 l df *ABS* 00000000 stm32f10x_can.c 00000000 l df *ABS* 00000000 _exit.c +00000000 l df *ABS* 00000000 led.c +2000009c l O .bss 00000004 timer_counter_last.6552 +200000a0 l O .bss 00000001 led_toggle_state.6551 +00000000 l df *ABS* 00000000 boot.c +08006ab4 l F .text 00000058 CanGetSpeedConfig +08006b0c l F .text 00000080 BootComUartInit +08006b8c l F .text 000000fc BootComCanInit +08006c88 l F .text 00000024 UartReceiveByte +08006cd4 l F .text 00000098 BootComUartCheckActivationRequest +08006d6c l F .text 00000050 BootComCanCheckActivationRequest +200000a4 l O .bss 00000004 xcpCtoRxStartTime.6574 +200000a8 l O .bss 00000041 xcpCtoReqPacket.6571 +200000e9 l O .bss 00000001 xcpCtoRxLength.6572 +200000ea l O .bss 00000001 xcpCtoRxInProgress.6573 +08006e64 l O .text 00000024 canTiming 00000000 l df *ABS* 00000000 exit.c 00000000 l df *ABS* 00000000 init.c 00000000 l df *ABS* 00000000 memset.c @@ -117,7 +117,7 @@ SYMBOL TABLE: 00000000 l df *ABS* 00000000 impure.c 20000014 l O .data 00000060 impure_data 00000000 l df *ABS* 00000000 crtstuff.c -08006e78 l O .text 00000000 __FRAME_END__ +08006e8c l O .text 00000000 __FRAME_END__ 00000000 l df *ABS* 00000000 20000078 l .data 00000000 __init_array_end 20000074 l .data 00000000 __preinit_array_end @@ -130,94 +130,94 @@ SYMBOL TABLE: 20000000 g .data 00000000 __data_start__ 08006250 w F .text 00000002 TIM1_CC_IRQHandler 08006208 w F .text 00000002 HardFault_Handler -080068b8 g F .text 000000f4 CAN_FilterInit -08006760 g F .text 00000010 SysTick_Handler +08006850 g F .text 000000f4 CAN_FilterInit +080062bc g F .text 00000010 SysTick_Handler 0800621c w F .text 00000002 PVD_IRQHandler 08006214 w F .text 00000002 PendSV_Handler 08006206 w F .text 00000002 NMI_Handler -08006e84 g .ARM.exidx 00000000 __exidx_end +08006e98 g .ARM.exidx 00000000 __exidx_end 0800622c w F .text 00000002 EXTI3_IRQHandler -08006e84 g .ARM.exidx 00000000 __etext -08006c88 g F .text 0000000e USART_GetFlagStatus -08006d3c g F .text 00000074 GPIO_PinRemapConfig +08006e98 g .ARM.exidx 00000000 __etext +080064d0 g F .text 0000000e USART_GetFlagStatus +08006694 g F .text 00000074 GPIO_PinRemapConfig 08006226 w F .text 00000002 EXTI0_IRQHandler 0800625c w F .text 00000002 I2C2_EV_IRQHandler -08006c80 g F .text 00000008 USART_ReceiveData +080064c8 g F .text 00000008 USART_ReceiveData 0800620e w F .text 00000002 UsageFault_Handler -08006b48 g F .text 0000001c RCC_APB2PeriphClockCmd +0800659c g F .text 0000001c RCC_APB2PeriphClockCmd 0800623e w F .text 00000002 ADC1_2_IRQHandler -08006c98 g F .text 0000009a GPIO_Init +080065f0 g F .text 0000009a GPIO_Init 200008f0 g .heap 00000000 __HeapLimit 2000007c g .bss 00000000 __bss_start__ 08006260 w F .text 00000002 SPI1_IRQHandler -08006c64 g F .text 0000001c USART_Cmd +080064ac g F .text 0000001c USART_Cmd 0800621e w F .text 00000002 TAMPER_IRQHandler -08006b64 g F .text 0000001c RCC_APB1PeriphClockCmd -08006e7c g .text 00000000 __exidx_start -08006e74 g O .text 00000004 _global_impure_ptr -08006ddc g F .text 0000004c __libc_init_array +080065b8 g F .text 0000001c RCC_APB1PeriphClockCmd +08006e90 g .text 00000000 __exidx_start +08006e88 g O .text 00000004 _global_impure_ptr +08006df0 g F .text 0000004c __libc_init_array 08006236 w F .text 00000002 DMA1_Channel4_IRQHandler 0800614c g F .text 00000000 _mainCRTStartup -08006770 g F .text 00000038 CAN_DeInit -08006e38 g F .text 00000000 _init -0800647c g F .text 0000001c BootActivate +08006708 g F .text 00000038 CAN_DeInit +08006e4c g F .text 00000000 _init +08006cb8 g F .text 0000001c BootActivate 08006268 w F .text 00000002 USART3_IRQHandler 00000000 w *UND* 00000000 __libc_fini_array 08006220 w F .text 00000002 RTC_IRQHandler 0800623c w F .text 00000002 DMA1_Channel7_IRQHandler 080061c0 g F .text 00000030 Reset_Handler 08006244 w F .text 00000002 CAN1_RX1_IRQHandler -08006690 g F .text 0000003c LedInit -08006d34 g F .text 00000004 GPIO_SetBits +08006a28 g F .text 0000003c LedInit +0800668c g F .text 00000004 GPIO_SetBits 08006256 w F .text 00000002 TIM4_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stderr 00000000 w *UND* 00000000 __deregister_frame_info 200000f0 g .heap 00000000 end 08006258 w F .text 00000002 I2C1_EV_IRQHandler 2000007c g .data 00000000 __data_end__ -08006a8c g F .text 000000bc RCC_GetClocksFreq +080064e0 g F .text 000000bc RCC_GetClocksFreq 0800623a w F .text 00000002 DMA1_Channel6_IRQHandler -08006b9c g F .text 000000c8 USART_Init -200000ec g .bss 00000000 __bss_end__ +080063e4 g F .text 000000c8 USART_Init +200000eb g .bss 00000000 __bss_end__ 00000800 g *ABS* 00000000 __STACK_SIZE 08006254 w F .text 00000002 TIM3_IRQHandler 08006224 w F .text 00000002 RCC_IRQHandler -080069cc g F .text 000000a4 CAN_Receive +08006964 g F .text 000000a4 CAN_Receive 0800624e w F .text 00000002 TIM1_TRG_COM_IRQHandler 00000000 w *UND* 00000000 __call_exitprocs -080067a8 g F .text 0000010e CAN_Init +08006740 g F .text 0000010e CAN_Init 08006230 w F .text 00000002 DMA1_Channel1_IRQHandler 08006218 w F .text 00000002 Default_Handler 0800614c g F .text 00000000 _start -080069ac g F .text 00000020 CAN_StructInit +08006944 g F .text 00000020 CAN_StructInit 0800626a w F .text 00000002 EXTI15_10_IRQHandler 00000000 w *UND* 00000000 software_init_hook -08006d38 g F .text 00000004 GPIO_ResetBits +08006690 g F .text 00000004 GPIO_ResetBits 08006248 w F .text 00000002 EXTI9_5_IRQHandler 08006262 w F .text 00000002 SPI2_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stdin -08006e28 g F .text 00000010 memset +08006e3c g F .text 00000010 memset 0800620a w F .text 00000002 MemManage_Handler 08006000 g .text 000000f0 __isr_vector -0800667c g F .text 00000014 main +080063d0 g F .text 00000014 main 08006210 w F .text 00000002 SVC_Handler 00000000 w *UND* 00000000 hardware_init_hook 200000f0 g .heap 00000000 __end__ 08006238 w F .text 00000002 DMA1_Channel5_IRQHandler -08006a70 g F .text 0000001a CAN_MessagePending +08006a08 g F .text 0000001a CAN_MessagePending 0800622e w F .text 00000002 EXTI4_IRQHandler -0800671c g F .text 0000000c TimerSet +08006278 g F .text 0000000c TimerSet 08006242 w F .text 00000002 USB_LP_CAN1_RX0_IRQHandler -08006470 g F .text 0000000c BootComInit -08006e44 g F .text 00000000 _fini +08006cac g F .text 0000000c BootComInit +08006e58 g F .text 00000000 _fini 08006240 w F .text 00000002 USB_HP_CAN1_TX_IRQHandler 00000000 w *UND* 00000000 atexit 08006234 w F .text 00000002 DMA1_Channel3_IRQHandler 20005000 g .bss 00000000 __StackTop 0800624c w F .text 00000002 TIM1_UP_IRQHandler 0800621a w F .text 00000002 WWDG_IRQHandler -08006b80 g F .text 0000001c RCC_APB1PeriphResetCmd -080066cc g F .text 00000050 LedToggle +080065d4 g F .text 0000001c RCC_APB1PeriphResetCmd +08006a64 g F .text 00000050 LedToggle 08006252 w F .text 00000002 TIM2_IRQHandler 0800624a w F .text 00000002 TIM1_BRK_IRQHandler 20005000 g *ABS* 00000000 __stack @@ -225,20 +225,20 @@ SYMBOL TABLE: 0800626c w F .text 00000002 RTCAlarm_IRQHandler 20004800 g *ABS* 00000800 __StackLimit 08006266 w F .text 00000002 USART2_IRQHandler -08006db4 g F .text 00000028 exit +08006dc8 g F .text 00000028 exit 0800625e w F .text 00000002 I2C2_ER_IRQHandler 08006232 w F .text 00000002 DMA1_Channel2_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stdout -0800656c g F .text 0000000c BootComCheckActivationRequest +08006dbc g F .text 0000000c BootComCheckActivationRequest 08006246 w F .text 00000002 CAN1_SCE_IRQHandler 08006222 w F .text 00000002 FLASH_IRQHandler -08006db0 w F .text 00000002 _exit +08006a24 w F .text 00000002 _exit 0800620c w F .text 00000002 BusFault_Handler 08006264 w F .text 00000002 USART1_IRQHandler 0800625a w F .text 00000002 I2C1_ER_IRQHandler -08006754 g F .text 0000000c TimerGet +080062b0 g F .text 0000000c TimerGet 00000000 w *UND* 00000000 _Jv_RegisterClasses -08006728 g F .text 0000002c TimerInit +08006284 g F .text 0000002c TimerInit 00000000 w *UND* 00000000 __register_frame_info 0800626e w F .text 00000002 USBWakeUp_IRQHandler diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.srec b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.srec index 83f34bea..4b8d725f 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.srec +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/bin/demoprog_olimex_stm32p103.srec @@ -2,7 +2,7 @@ S025000062696E2F64656D6F70726F675F6F6C696D65785F73746D3332703130332E7372656331 S3150800600000500020C1610008076200080962000804 S315080060100B6200080D6200080F620008000000000D S3150800602000000000000000000000000011620008E7 -S315080060301362000800000000156200086167000886 +S31508006030136200080000000015620008BD6200082F S315080060401B6200081D6200081F6200082162000822 S3150800605023620008256200082762000829620008F2 S315080060602B6200082D6200082F62000831620008C2 @@ -16,228 +16,229 @@ S315080060D06362000865620008676200086962000872 S315080060E06B6200086D6200086F620008EE11AA551F S315080060F010B5054C237833B9044B13B10448AFF3F4 S3150800610000800123237010BD7C00002000000000E1 -S31508006110786E0008084B10B51BB108490848AFF35C +S315080061108C6E0008084B10B51BB108490848AFF348 S3150800612000800848036803B910BD074B002BFBD055 S31508006130BDE81040184700BF00000000800000209E -S31508006140786E00087C00002000000000154B002B2C +S315080061408C6E00087C00002000000000154B002B18 S3150800615008BF134B9D46A3F5803A00218B460F4690 -S315080061601348144A121A00F05FFE0F4B002B00D09A +S315080061601348144A121A00F069FE0F4B002B00D090 S3150800617098470E4B002B00D09847002000210400BA S315080061800D000D48002802D00C48AFF3008000F03F -S3150800619025FE2000290000F071FA00F00BFE00BF72 +S315080061902FFE2000290000F01BF900F015FE00BFB5 S315080061A00000080000500020000000000000000069 -S315080061B07C000020EC000020000000000000000029 +S315080061B07C000020EB00002000000000000000002A S315080061C006498D460649074A074B9A42BEBF51F80B S315080061D0040B42F8040BF8E7044800470050002077 -S315080061E0846E0008000000207C0000204D61000835 +S315080061E0986E0008000000207C0000204D61000821 S315080061F01F49204A002301E041F8043B9142FBD3A2 -S3150800620000F03CFAFEE7FEE7FEE7FEE7FEE7FEE7FC +S3150800620000F0E6F8FEE7FEE7FEE7FEE7FEE7FEE754 S31508006210FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE748 S31508006220FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE738 S31508006230FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE728 S31508006240FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE718 S31508006250FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE708 S31508006260FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE7F8 -S315080062707C000020EC000020F0B5002421E0134D3E -S3150800628015F8147005EB440595F801E007EB0E05C3 -S3150800629005FB000548F6A04C9CFBF5F605FB16C663 -S315080062A06EB99CFBF5F5ADB20D80013DADB2B5F505 -S315080062B0806F04D2177083F800E00120F0BD013426 -S315080062C0E4B2112CDBD90020F0BD00BF506E0008E7 -S315080062D030B587B001214FF4003000F043FC0121AE -S315080062E0052000F031FC18238DF817300425ADF889 -S315080062F0145003238DF81630144C05A9204600F0D7 -S31508006300CBFC8DF817500823ADF8143005A92046A4 -S3150800631000F0C2FC4FF4614301930023ADF8083046 -S31508006320ADF80A30ADF80C30ADF810300C23ADF8E6 -S315080063300E30A4F544440DEB0501204600F02EFC72 -S315080063400121204600F08EFC07B030BD0008014050 -S3150800635030B58BB00121084600F0F6FB0121082074 -S3150800636000F0F2FB4FF48073ADF8243048238DF823 -S315080063702730344C09A9204600F08EFC4FF40073F0 -S31508006380ADF8243018238DF8273003238DF82630EE -S3150800639009A9204600F080FC01214FF4EA1000F01C -S315080063A0CDFC01214FF0007000F0DCFB264D28469D -S315080063B000F0DEF906A800F0F9FA01AB0DF10502C6 -S315080063C00DF106014FF4FA70FFF756FF00248DF819 -S315080063D01E408DF81F408DF820408DF821408DF81D -S315080063E022408DF823408DF81A408DF81B409DF801 -S315080063F00530013B8DF81C309DF80430013B8DF8C3 -S315080064001D30BDF80630ADF8183006A9284600F04C -S31508006410CBF98DF812408DF8134001238DF814300E -S31508006420ADF80840ADF80A40ADF80C40ADF80E409E -S31508006430ADF810408DF8153002A800F03DFA0BB003 -S3150800644030BD00BF000C01400064004010B5044692 -S315080064502021064800F018FC012805D1034800F061 -S315080064600FFC2070012010BD002010BD0044004024 -S3150800647008B5FFF72DFFFFF76BFF08BD0449CA688B -S3150800648002F4E062034B1343CB60BFF34F8FFEE782 -S3150800649000ED00E00400FA0508B5204B1B789BB90F -S315080064A01F48FFF7D3FF012836D11D4B1B78002B59 -S315080064B032D000F04FF91B4B18600122174B1A70A7 -S315080064C00022194B1A7008BD174B1B780133144864 -S315080064D01844FFF7BBFF012814D1134A1378013378 -S315080064E0DBB213700E4A1278934215D100220B4B79 -S315080064F01A700B4B5B78FF2B0ED1094B9B785BB957 -S31508006500FFF7BCFF00F026F9064B1B686433984278 -S3150800651002D90022014B1A7008BD00BFDE00002018 -S315080065209C00002098000020DD00002000B587B000 -S3150800653000210D4800F09CFA90B101AA00210A48F2 -S3150800654000F044FA40F26763019A9A4208D19DF82E -S315080065500F30FF2B04D19DF810300BB9FFF78EFFD3 -S3150800656007B05DF804FB00BF0064004008B5FFF7FC -S3150800657093FFFFF7DBFF08BD00B583B00023019347 -S31508006580009303F1804303F504331A6842F00102CD -S315080065901A605968364A0A405A601A6822F08472A4 -S315080065A022F480321A601A6822F480221A605A6825 -S315080065B022F4FE025A604FF41F029A601A6842F4E7 -S315080065C080321A602B4B1B6803F400330093019B3F -S315080065D001330193009B23B9019A40F2DC539A4296 -S315080065E0F0D1244B1B6813F4003F00D1FEE7224B81 -S315080065F01A6842F010021A601A6822F003021A603A -S315080066001A6842F002021A60A3F580535A685A6063 -S315080066105A6842F400525A605A6842F480625A60D4 -S315080066205A6822F47C125A605A6842F4E8125A6090 -S315080066301A6842F080721A600E4B1B6813F0007FCE -S31508006640FAD00C4B5A6822F003025A605A6842F094 -S3150800665002025A60074B5B6803F00C03082BF9D15A -S3150800666000F016F800F060F803B05DF804FB00BF10 -S315080066700000FFF8001002400020024008B5FFF7AE -S315080066807BFFFFF7F5FE00F021F8FFF76FFFFAE74B -S3150800669030B583B00121102000F056FA4FF480552A -S315080066A0ADF8045003238DF8063010238DF8073013 -S315080066B0054C01A9204600F0EFFA2946204600F0CD -S315080066C039FB03B030BD00BF0010014010B500F023 -S315080066D041F80F4B1B68C31AB3F5FA7F16D3044665 -S315080066E00C4B1B7843B901220A4B1A704FF48051A0 -S315080066F0094800F021FB07E00022064B1A704FF408 -S315080067008051054800F016FB014B1C6010BD00BF08 -S31508006710E0000020E400002000100140014B186052 -S31508006720704700BFE800002008B5074B074A5A60C3 -S31508006730F021074A82F823100020986007221A6081 -S31508006740FFF7ECFF08BD00BF10E000E03F190100AD -S3150800675000ED00E0014B1868704700BFE800002014 -S31508006760024A136801331360704700BFE80000202F -S3150800677008B50C4B98420AD101214FF0007000F081 -S31508006780FFF900214FF0007000F0FAF908BD012169 -S315080067904FF0806000F0F4F900214FF0806000F0BF -S315080067A0EFF908BD00640040036823F002030360A4 -S315080067B0036843F001030360002300E001334268E5 -S315080067C012F0010F03D14FF6FF729342F6D14368D8 -S315080067D013F0010F6BD08B79012B04D1036843F0BA -S315080067E08003036003E0036823F080030360CB792A -S315080067F0012B04D1036843F04003036003E00368F8 -S3150800680023F0400303600B7A012B04D1036843F09D -S315080068102003036003E0036823F0200303604B7A38 -S31508006820012B04D1036843F01003036003E00368F7 -S3150800683023F0100303608B7A012B04D1036843F01D -S315080068400803036003E0036823F008030360CB7AB8 -S31508006850012B04D1036843F00403036003E00368D3 -S3150800686023F0040303608A78CB781B0643EA827315 -S315080068700A7943EA02434A7943EA02530A88013A03 -S315080068801343C361036823F001030360002300E098 -S315080068900133426812F0010F03D04FF6FF7293429C -S315080068A0F6D1436813F0010F03D00020704700208B -S315080068B070470120704700BF70B4837A012202FA3C -S315080068C003F3394AD2F8001241F00101C2F8001266 -S315080068D0D2F81C12DC432140C2F81C12027BB2B962 -S315080068E0314AD2F80C122140C2F80C12817AC688B5 -S315080068F0458845EA0645483142F83150857A868802 -S31508006900018841EA0641483502EBC5025160027B1F -S31508006910012A16D1244AD2F80C121943C2F80C12CD -S31508006920817A0688458845EA0645483142F8315055 -S31508006930857A8688C18841EA0641483502EBC50250 -S315080069405160C27A32B91849D1F804222240C1F8F6 -S31508006950042205E01449D1F804221A43C1F8042296 -S3150800696002892AB91049D1F814221440C1F81442F0 -S315080069700289012A05D10C49D1F814221A43C1F813 -S315080069801422427B012A05D10749D1F81C22134358 -S31508006990C1F81C32044AD2F8003223F00103C2F8C7 -S315080069A0003270BC704700BF00640040002383714A -S315080069B0C371037243728372C3728370C3700323F5 -S315080069C003710223437101230380704710B401F158 -S315080069D01B031B01C35803F00403DBB2137233B95C -S315080069E001F11B031B01C3585B0D136005E001F1A0 -S315080069F01B031B01C358DB08536001F11B031B0172 -S31508006A00C418C35803F002035372636803F00F03F4 -S31508006A10937263681B0AD37400EB0113D3F8B84169 -S31508006A20D472D3F8B841240A1473D3F8B841240CA5 -S31508006A305473D3F8B841240E9473D3F8BC41D47375 -S31508006A40D3F8BC41240A1474D3F8BC41240C5474FA -S31508006A50D3F8BC311B0E937421B9C36843F02003E5 -S31508006A60C36003E0036943F02003036110BC704769 -S31508006A7019B9C06800F003007047012903D10069FD -S31508006A8000F0030070470020704700BF10B4294B80 -S31508006A905B6803F00C03042B05D0082B06D013BB48 -S31508006AA0254B036021E0244B03601EE0214A53680E -S31508006AB05268C3F38343023312F4803F04D11F4A5A -S31508006AC002FB03F3036010E01A4A526812F4003F0F -S31508006AD004D01A4A02FB03F3036006E0164A02FBD7 -S31508006AE003F3036001E0144B036012494B68C3F3D8 -S31508006AF00313134CE35CDAB20368D34043604A6875 -S31508006B00C2F30222A25CD2B223FA02F282604A6877 -S31508006B10C2F3C222A25CD2B2D340C3604A68C2F3AF -S31508006B20813208498A5CD2B2B3FBF2F3036110BC26 -S31508006B30704700BF0010024000127A0000093D00AD -S31508006B40040000200000002021B1054B9A6910437B -S31508006B5098617047024A936923EA0000906170477A -S31508006B600010024021B1054BDA691043D86170471D -S31508006B70024AD36923EA0000D06170470010024038 -S31508006B8021B1054B1A69104318617047024A136907 -S31508006B9023EA0000106170470010024030B587B044 -S31508006BA004460D46038A9BB2CA8823F4405313430E -S31508006BB0038283899BB28A88098968890A430243C2 -S31508006BC023F4B05323F00C031343A381A38A9BB287 -S31508006BD0AA8923F440731343A38201A8FFF756FF3B -S31508006BE01E4B9C4201D1049A00E0039AA38913F430 -S31508006BF0004F08D002EB820202EB820229684900A4 -S31508006C00B2FBF1F107E002EB820202EB820229688D -S31508006C108900B2FBF1F1124BA3FB01235B091B01AF -S31508006C201A09642000FB1212A18911F4004F08D03A -S31508006C30D20032320A49A1FB0212C2F342121A43A7 -S31508006C4007E0120132320649A1FB0212C2F34312CF -S31508006C501A4392B2228107B030BD00BF0038014006 -S31508006C601F85EB5129B183899BB243F40053838175 -S31508006C70704783899BB223F400539BB28381704784 -S31508006C808088C0F3080070470388194201D00120A4 -S31508006C9070470020704700BFF0B4CB7803F00F02AE -S31508006CA0154613F0100F01D08D7815430B78E3B114 -S31508006CB00668002316E001229A400C8832EA04048A -S31508006CC00FD19C000F27A74026EA070605FA04F409 -S31508006CD02643CC78282C01D1426102E0482C00D109 -S31508006CE002610133072BE6D906600B88FF2B1ED9F4 -S31508006CF04668002318E003F108040122A2400C8824 -S31508006D0032EA04040FD19C000F27A74026EA07069B -S31508006D1005FA04F42643CC78282C00D14261CC78B5 -S31508006D20482C00D102610133072BE4D94660F0BC38 -S31508006D30704700BF016170474161704730B4002851 -S31508006D4002DA1A4BDB6901E0184B5B68C0F30345AE -S31508006D5082B200F44014B4F5401F07D123F07063E3 -S31508006D60124D6C6824F070646C6011E010F4801F9A -S31508006D7006D00324AC4023EA040343F0706307E01B -S31508006D80440D240102FA04F423EA040343F0706371 -S31508006D9019B1410D09018A401343002802DA034A52 -S31508006DA0D36101E0014A536030BC704700000140DE -S31508006DB0FEE700BF08B5074B044613B10021AFF341 -S31508006DC00080054B1868836A03B198472046FFF789 -S31508006DD0EFFF00BF00000000746E00080E4B70B590 -S31508006DE01E460E4C0025E41AA410A54204D056F8F7 -S31508006DF0253098470135F8E700F01EF8084B094C8E -S31508006E001E46E41AA4100025A54204D056F82530DB -S31508006E1098470135F8E770BD74000020740000201B -S31508006E20740000207800002003460244934202D0F2 -S31508006E3003F8011BFAE77047F8B500BFF8BC08BCB1 -S31508006E409E467047F8B500BFF8BC08BC9E4670471A -S31508006E5005020602060307030803090309040A04D0 -S31508006E600B040C040C050D050E050F050F06100680 -S31108006E70100710081400002000000000A5 -S30D08006E7CD0F2FF7F01000000BF -S31508006E8402040608000000000102030401020304C8 -S31508006E9406070809000000000000000000000000C2 -S31508006EA400000000000000000000000000000000D0 -S31508006EB400000000000000000000000000000000C0 -S31508006EC400000000000000000000000000000000B0 -S31508006ED400000000000000000000000000000000A0 -S31508006EE40000000000000000000000000000000090 -S31108006EF40000000015610008F1600008AD +S315080062707C000020EB000020014B1860704700BF2F +S315080062809800002008B5074B074A5A60F021074ACC +S3150800629082F823100020986007221A60FFF7ECFFA7 +S315080062A008BD00BF10E000E03F19010000ED00E066 +S315080062B0014B1868704700BF98000020024A13680F +S315080062C001331360704700BF9800002000B583B003 +S315080062D000230193009303F1804303F504331A68FE +S315080062E042F001021A605968364A0A405A601A682A +S315080062F022F0847222F480321A601A6822F480220C +S315080063001A605A6822F4FE025A604FF41F029A6015 +S315080063101A6842F480321A602B4B1B6803F4003368 +S315080063200093019B01330193009B23B9019A40F224 +S31508006330DC539A42F0D1244B1B6813F4003F00D17A +S31508006340FEE7224B1A6842F010021A601A6822F019 +S3150800635003021A601A6842F002021A60A3F5805313 +S315080063605A685A605A6842F400525A605A6842F4A7 +S3150800637080625A605A6822F47C125A605A6842F45B +S31508006380E8125A601A6842F080721A600E4B1B684F +S3150800639013F0007FFAD00C4B5A6822F003025A60B9 +S315080063A05A6842F002025A60074B5B6803F00C0316 +S315080063B0082BF9D100F038FBFFF764FF03B05DF84E +S315080063C004FB00BF0000FFF8001002400020024056 +S315080063D008B5FFF77BFF00F069FC00F043FB00F00F +S315080063E0EDFCFAE730B587B004460D46038A9BB242 +S315080063F0CA8823F440531343038283899BB28A884D +S31508006400098968890A43024323F4B05323F00C032D +S315080064101343A381A38A9BB2AA8923F44073134327 +S31508006420A38201A800F05CF81E4B9C4201D1049A95 +S3150800643000E0039AA38913F4004F08D002EB820206 +S3150800644002EB820229684900B2FBF1F107E002EB90 +S31508006450820202EB820229688900B2FBF1F1124B33 +S31508006460A3FB01235B091B011A09642000FB121216 +S31508006470A18911F4004F08D0D20032320A49A1FB93 +S315080064800212C2F342121A4307E0120132320649D7 +S31508006490A1FB0212C2F343121A4392B2228107B039 +S315080064A030BD00BF003801401F85EB5129B18389F3 +S315080064B09BB243F400538381704783899BB223F4CC +S315080064C000539BB2838170478088C0F308007047E9 +S315080064D00388194201D0012070470020704700BF89 +S315080064E010B4294B5B6803F00C03042B05D0082B6A +S315080064F006D013BB254B036021E0244B03601EE046 +S31508006500214A53685268C3F38343023312F4803F27 +S3150800651004D11F4A02FB03F3036010E01A4A5268CB +S3150800652012F4003F04D01A4A02FB03F3036006E0A4 +S31508006530164A02FB03F3036001E0144B0360124999 +S315080065404B68C3F30313134CE35CDAB20368D34016 +S3150800655043604A68C2F30222A25CD2B223FA02F26C +S3150800656082604A68C2F3C222A25CD2B2D340C36038 +S315080065704A68C2F3813208498A5CD2B2B3FBF2F3A5 +S31508006580036110BC704700BF0010024000127A0079 +S3150800659000093D00040000200000002021B1054B41 +S315080065A09A69104398617047024A936923EA000082 +S315080065B0906170470010024021B1054BDA6910431B +S315080065C0D8617047024AD36923EA0000D061704750 +S315080065D00010024021B1054B1A6910431861704733 +S315080065E0024A136923EA000010617047001002404E +S315080065F0F0B4CB7803F00F02154613F0100F01D054 +S315080066008D7815430B78E3B10668002316E001225E +S315080066109A400C8832EA04040FD19C000F27A74041 +S3150800662026EA070605FA04F42643CC78282C01D175 +S31508006630426102E0482C00D102610133072BE6D9FA +S3150800664006600B88FF2B1ED94668002318E003F165 +S3150800665008040122A2400C8832EA04040FD19C00E7 +S315080066600F27A74026EA070605FA04F42643CC783E +S31508006670282C00D14261CC78482C00D10261013324 +S31508006680072BE4D94660F0BC704700BF016170472C +S315080066904161704730B4002802DA1A4BDB6901E021 +S315080066A0184B5B68C0F3034582B200F44014B4F596 +S315080066B0401F07D123F07063124D6C6824F0706494 +S315080066C06C6011E010F4801F06D00324AC4023EA66 +S315080066D0040343F0706307E0440D240102FA04F44E +S315080066E023EA040343F0706319B1410D09018A4096 +S315080066F01343002802DA034AD36101E0014A5360D2 +S3150800670030BC70470000014008B50C4B98420AD1CE +S3150800671001214FF00070FFF75DFF00214FF0007078 +S31508006720FFF758FF08BD01214FF08060FFF752FFC1 +S3150800673000214FF08060FFF74DFF08BD0064004060 +S31508006740036823F002030360036843F00103036050 +S31508006750002300E00133426812F0010F03D14FF61F +S31508006760FF729342F6D1436813F0010F6BD08B7911 +S31508006770012B04D1036843F08003036003E0036838 +S3150800678023F080030360CB79012B04D1036843F01F +S315080067904003036003E0036823F0400303600B7AB9 +S315080067A0012B04D1036843F02003036003E0036868 +S315080067B023F0200303604B7A012B04D1036843F0CE +S315080067C01003036003E0036823F0100303608B7A69 +S315080067D0012B04D1036843F00803036003E0036850 +S315080067E023F008030360CB7A012B04D1036843F036 +S315080067F00403036003E0036823F0040303608A7854 +S31508006800CB781B0643EA82730A7943EA02434A793C +S3150800681043EA02530A88013A1343C361036823F023 +S3150800682001030360002300E00133426812F0010F00 +S3150800683003D04FF6FF729342F6D1436813F0010F67 +S3150800684003D000207047002070470120704700BF22 +S3150800685070B4837A012202FA03F3394AD2F8001295 +S3150800686041F00101C2F80012D2F81C12DC432140A3 +S31508006870C2F81C12027BB2B9314AD2F80C12214076 +S31508006880C2F80C12817AC688458845EA0645483119 +S3150800689042F83150857A8688018841EA06414835AA +S315080068A002EBC5025160027B012A16D1244AD2F8AE +S315080068B00C121943C2F80C12817A0688458845EAF3 +S315080068C00645483142F83150857A8688C18841EABA +S315080068D00641483502EBC5025160C27A32B91849F9 +S315080068E0D1F804222240C1F8042205E01449D1F85F +S315080068F004221A43C1F8042202892AB91049D1F898 +S3150800690014221440C1F814420289012A05D10C49FF +S31508006910D1F814221A43C1F81422427B012A05D160 +S315080069200749D1F81C221343C1F81C32044AD2F88D +S31508006930003223F00103C2F8003270BC704700BF72 +S315080069400064004000238371C3710372437283722B +S31508006950C3728370C3700323037102234371012337 +S315080069600380704710B401F11B031B01C35803F0E1 +S315080069700403DBB2137233B901F11B031B01C358BD +S315080069805B0D136005E001F11B031B01C358DB080F +S31508006990536001F11B031B01C418C35803F002031B +S315080069A05372636803F00F03937263681B0AD37408 +S315080069B000EB0113D3F8B841D472D3F8B841240ACE +S315080069C01473D3F8B841240C5473D3F8B841240E81 +S315080069D09473D3F8BC41D473D3F8BC41240A147415 +S315080069E0D3F8BC41240C5474D3F8BC311B0E9374F1 +S315080069F021B9C36843F02003C36003E0036943F089 +S31508006A002003036110BC704719B9C06800F0030081 +S31508006A107047012903D1006900F003007047002080 +S31508006A20704700BFFEE700BF30B583B001211020D4 +S31508006A30FFF7B4FD4FF48055ADF8045003238DF8E5 +S31508006A40063010238DF80730054C01A92046FFF7BC +S31508006A50CFFD29462046FFF719FE03B030BD00BF1B +S31508006A600010014010B5FFF723FC0F4B1B68C31A33 +S31508006A70B3F5FA7F16D304460C4B1B7843B90122AB +S31508006A800A4B1A704FF480510948FFF701FE07E0D8 +S31508006A900022064B1A704FF480510548FFF7F6FDA1 +S31508006AA0014B1C6010BD00BF9C000020A000002008 +S31508006AB000100140F0B5002421E0134D15F81470BC +S31508006AC005EB440595F801E007EB0E0505FB000507 +S31508006AD048F6A04C9CFBF5F605FB16C66EB99CFB62 +S31508006AE0F5F5ADB20D80013DADB2B5F5806F04D2B6 +S31508006AF0177083F800E00120F0BD0134E4B2112CD0 +S31508006B00DBD90020F0BD00BF646E000830B587B041 +S31508006B1001214FF40030FFF74FFD01210520FFF753 +S31508006B203DFD18238DF817300425ADF814500323BE +S31508006B308DF81630144C05A92046FFF759FD8DF837 +S31508006B4017500823ADF8143005A92046FFF750FD65 +S31508006B504FF4614301930023ADF80830ADF80A30CD +S31508006B60ADF80C30ADF810300C23ADF80E30A4F5A6 +S31508006B7044440DEB05012046FFF734FC012120466D +S31508006B80FFF794FC07B030BD0008014030B58BB064 +S31508006B9001210846FFF702FD01210820FFF7FEFC48 +S31508006BA04FF48073ADF8243048238DF82730344CE1 +S31508006BB009A92046FFF71CFD4FF40073ADF82430F1 +S31508006BC018238DF8273003238DF8263009A9204687 +S31508006BD0FFF70EFD01214FF4EA10FFF75BFD0121D7 +S31508006BE04FF00070FFF7E8FC264D2846FFF78CFDAE +S31508006BF006A8FFF7A7FE01AB0DF105020DF1060188 +S31508006C004FF4FA70FFF756FF00248DF81E408DF8F2 +S31508006C101F408DF820408DF821408DF822408DF8D0 +S31508006C2023408DF81A408DF81B409DF80530013B2E +S31508006C308DF81C309DF80430013B8DF81D30BDF8E9 +S31508006C400630ADF8183006A92846FFF779FD8DF805 +S31508006C5012408DF8134001238DF81430ADF8084022 +S31508006C60ADF80A40ADF80C40ADF80E40ADF810404E +S31508006C708DF8153002A8FFF7EBFD0BB030BD00BF4D +S31508006C80000C01400064004010B504462021064867 +S31508006C90FFF71EFC012805D10348FFF715FC2070F5 +S31508006CA0012010BD002010BD0044004008B5FFF7C4 +S31508006CB02DFFFFF76BFF08BD0449CA6802F4E062BE +S31508006CC0034B1343CB60BFF34F8FFEE700ED00E0A5 +S31508006CD00400FA0508B5214B1B78ABB92048FFF725 +S31508006CE0D3FF012838D11E4B1B78013BDBB23F2B63 +S31508006CF032D8FFF7DDFA1B4B18600122174B1A70C2 +S31508006D000022194B1A7008BD174B1B78013314481B +S31508006D101844FFF7B9FF012814D1134A1378013331 +S31508006D20DBB213700E4A1278934215D100220B4B30 +S31508006D301A700B4B5B78FF2B0ED1094B9B785BB90E +S31508006D40FFF7BAFFFFF7B4FA064B1B68643398429D +S31508006D5002D90022014B1A7008BD00BFEA000020C4 +S31508006D60A8000020A4000020E900002000B587B094 +S31508006D7000211148FFF748FED8B101AA00210E48A4 +S31508006D80FFF7F0FD9DF80C3033B940F26763019ABE +S31508006D909A4203D0002302E0002300E0012343B116 +S31508006DA09DF80F30FF2B04D19DF810300BB9FFF773 +S31508006DB083FF07B05DF804FB0064004008B5FFF7E1 +S31508006DC089FFFFF7D3FF08BD08B5074B044613B183 +S31508006DD00021AFF30080054B1868836A03B1984712 +S31508006DE02046FFF71FFE00BF00000000886E00085F +S31508006DF00E4B70B51E460E4C0025E41AA410A5428B +S31508006E0004D056F8253098470135F8E700F01EF803 +S31508006E10084B094C1E46E41AA4100025A54204D0C6 +S31508006E2056F8253098470135F8E770BD74000020FC +S31508006E3074000020740000207800002003460244F5 +S31508006E40934202D003F8011BFAE77047F8B500BF72 +S31508006E50F8BC08BC9E467047F8B500BFF8BC08BC2D +S31508006E609E46704705020602060307030803090340 +S31508006E7009040A040B040C040C050D050E050F0580 +S31508006E800F06100610071008140000200000000066 +S30D08006E90BCF2FF7F01000000BF +S31508006E9802040608000000000102030401020304B4 +S31508006EA806070809000000000000000000000000AE +S31508006EB800000000000000000000000000000000BC +S31508006EC800000000000000000000000000000000AC +S31508006ED8000000000000000000000000000000009C +S31508006EE8000000000000000000000000000000008C +S31508006EF8000000000000000000000000000000007C +S31108006F080000000015610008F160000898 S7050800600092 diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_GCC/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index 6fb4579e..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_IAR/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,12 +260,19 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif +#endif } /** diff --git a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Keil/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Keil/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c index a50bfd92..1457e497 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Keil/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c +++ b/Target/Demo/ARMCM3_STM32F1_Olimex_STM32P103_Keil/Prog/lib/stdperiphlib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c @@ -260,13 +260,18 @@ void SystemInit (void) /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */ /* Configure the Flash Latency cycles and enable prefetch buffer */ SetSysClock(); - -#if 0 /* The OpenBLT bootloader handles the vector table relocation. */ - #ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ - #else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ - #endif + /* vector table initialization disabled because this is handled by the OpenBLT + * bootloader, right before this program is started. Alternatively, you can + * enable this code again as long as you set VECT_TAB_OFFSET to the actual start + * address of the vector table. This is not the default start in flash because this + * is where the OpenBLT bootloader resides. + */ +#if 0 + #ifdef VECT_TAB_SRAM + SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ + #else + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + #endif #endif }