diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf index 5b51df9e..4fc10ed8 100644 Binary files a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf and b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf differ diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/config.h b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/config.h rename to Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/blt_conf.h index 8e85e137..d0e79867 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/config.h +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARM7_LPC2000_Olimex_LPC_L2294_Crossworks\Boot\config.h +* \file Demo\ARM7_LPC2000_Olimex_LPC_L2294_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARM7_LPC2000_Olimex_LPC_L2294_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -155,5 +155,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzp b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzp index a36735fc..06bc8679 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzp +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzp @@ -7,13 +7,13 @@ - - + + diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzs b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzs index d3a8ea03..d8494a14 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzs +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/ide/lpc2294_crossworks.hzs @@ -51,7 +51,7 @@ - + - + diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/header.h b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/header.h index 0a00b94b..524b1a0b 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/header.h +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "lpc2294.h" /* CPU register definitions */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/ide/lpc2294_crossworks.hzs b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/ide/lpc2294_crossworks.hzs index b2ae838b..ba66e1af 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/ide/lpc2294_crossworks.hzs +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/ide/lpc2294_crossworks.hzs @@ -51,7 +51,7 @@ - + diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c index 06de599e..1282bb9d 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c @@ -51,7 +51,7 @@ static void Init(void); * \details ROM data allocated to the external flash on the Olimex LPC-L2294 board to * test the programming of data in external flash. To test programming with * the additional external flash driver, build the bootloader and this program - * with configurable BOOT_NVM_HOOKS_ENABLE set to 1 in config.h + * with configurable BOOT_NVM_HOOKS_ENABLE set to 1 in blt_conf.h */ __attribute__((section (".rodata2"))) const unsigned long ExtFlashTestData[] = { diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf index fc0bf962..3d46494e 100644 Binary files a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf and b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openbtl_olimex_lpc_l2294_20mhz.elf differ diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/config.h b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/config.h rename to Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h index 30d3d23b..0960407e 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/config.h +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARM7_LPC2000_Olimex_LPC_L2294_GCC\Boot\config.h +* \file Demo\ARM7_LPC2000_Olimex_LPC_L2294_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARM7_LPC2000_Olimex_LPC_L2294_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -155,5 +155,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.project index 23ad2541..0bf4c1b2 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.project @@ -43,12 +43,12 @@ - + diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/makefile b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/makefile index a6b622cb..902b7099 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/makefile +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_olimex_lpc_l2294_20mhz #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ extflash.c \ diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/header.h b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/header.h index dd9bf7a3..f4ce6a3c 100644 --- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/header.h +++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "lpc2294.h" /* CPU register definitions */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/bin/openbtl_olimex_efm32g880.elf b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/bin/openbtl_olimex_efm32g880.elf index e5666889..870322b5 100644 Binary files a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/bin/openbtl_olimex_efm32g880.elf and b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/bin/openbtl_olimex_efm32g880.elf differ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/config.h b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/config.h rename to Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/blt_conf.h index 93cc043b..28ca6993 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/config.h +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks\Boot\config.h +* \file Demo\ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -128,5 +128,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzp b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzp index 82c6d503..897ae4ed 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzp +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzp @@ -39,7 +39,7 @@ - + @@ -115,9 +115,9 @@ - + diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzs b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzs index f7180e93..58b44c19 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzs +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Boot/ide/EFM32G880_crossworks.hzs @@ -51,7 +51,7 @@ - + - + diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/bin/demoprog_olimex_efm32g880.elf b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/bin/demoprog_olimex_efm32g880.elf index eac0a92f..f2e3f275 100644 Binary files a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/bin/demoprog_olimex_efm32g880.elf and b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/bin/demoprog_olimex_efm32g880.elf differ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/header.h b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/header.h index 5b251d0c..665c646d 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/header.h +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "efm32.h" /* EFM32 registers */ #include "efm32_chip.h" /* EFM32 chip initialization */ #include "efm32_cmu.h" /* EFM32 clock management */ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/ide/EFM32G880_crossworks.hzs b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/ide/EFM32G880_crossworks.hzs index ddd0f2ef..0183af8f 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/ide/EFM32G880_crossworks.hzs +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_Crossworks/Prog/ide/EFM32G880_crossworks.hzs @@ -51,7 +51,7 @@ - + diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/bin/openbtl_olimex_efm32g880.elf b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/bin/openbtl_olimex_efm32g880.elf index 4086a206..e44db3c6 100644 Binary files a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/bin/openbtl_olimex_efm32g880.elf and b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/bin/openbtl_olimex_efm32g880.elf differ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/config.h b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/config.h rename to Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/blt_conf.h index 15503ffb..53066665 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/config.h +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC\Boot\config.h +* \file Demo\ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -128,5 +128,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/ide/DemoBoot.project index 44298452..26638776 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/ide/DemoBoot.project @@ -1,5 +1,10 @@ + + + + + @@ -124,17 +129,12 @@ - + - - - - - diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/makefile b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/makefile index 2f32d618..ac282d96 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/makefile +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_olimex_efm32g880 #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ ./lib/CMSIS/CM3/CoreSupport/core_cm3.c \ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/bin/demoprog_olimex_efm32g880.elf b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/bin/demoprog_olimex_efm32g880.elf index 1aa748ae..be9841cf 100644 Binary files a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/bin/demoprog_olimex_efm32g880.elf and b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/bin/demoprog_olimex_efm32g880.elf differ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/header.h b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/header.h index 14a0a3b8..096db334 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/header.h +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "efm32.h" /* EFM32 registers */ #include "efm32_chip.h" /* EFM32 chip initialization */ #include "efm32_cmu.h" /* EFM32 clock management */ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/bin/openbtl_olimex_efm32g880.out b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/bin/openbtl_olimex_efm32g880.out index 30a779d6..b94f3eb9 100644 Binary files a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/bin/openbtl_olimex_efm32g880.out and b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/bin/openbtl_olimex_efm32g880.out differ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/config.h b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/config.h rename to Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/blt_conf.h index 2bc07c13..65114986 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/config.h +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR\Boot\config.h +* \file Demo\ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -130,5 +130,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.dep b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.dep index ada66305..64cff412 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.dep +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.dep @@ -2,7 +2,7 @@ 2 - 524672902 + 4013620909 Debug @@ -81,7 +81,7 @@ $PROJ_DIR$\..\..\..\..\Source\ARMCM3_EFM32\cpu.c $PROJ_DIR$\..\..\..\..\Source\ARMCM3_EFM32\cpu.h $PROJ_DIR$\..\..\..\..\Source\ARMCM3_EFM32\flash.c - $PROJ_DIR$\..\obj\efm32G880.pbd + $PROJ_DIR$\..\obj\core_cm3.lst $PROJ_DIR$\..\..\..\..\Source\ARMCM3_EFM32\nvm.c $PROJ_DIR$\..\..\..\..\Source\ARMCM3_EFM32\flash.h $PROJ_DIR$\..\..\..\..\Source\ARMCM3_EFM32\nvm.h @@ -104,14 +104,15 @@ $PROJ_DIR$\..\..\..\..\Source\xcp.c $PROJ_DIR$\..\..\..\..\Source\xcp.h $PROJ_DIR$\..\obj\core_cm3.o + $PROJ_DIR$\..\obj\efm32G880.pbd $PROJ_DIR$\..\obj\system_efm32.pbi - $PROJ_DIR$\..\obj\efm32_assert.lst - $PROJ_DIR$\..\obj\boot.pbi - $PROJ_DIR$\..\obj\timer.o $PROJ_DIR$\..\obj\vectors.pbi - $PROJ_DIR$\..\obj\boot.lst $PROJ_DIR$\..\obj\main.pbi + $PROJ_DIR$\..\obj\boot.lst + $PROJ_DIR$\..\obj\timer.o $PROJ_DIR$\..\obj\timer.pbi + $PROJ_DIR$\..\obj\boot.pbi + $PROJ_DIR$\..\obj\efm32_assert.lst $PROJ_DIR$\..\obj\uart.pbi $PROJ_DIR$\..\obj\cstart.o $PROJ_DIR$\..\obj\vectors.o @@ -122,7 +123,6 @@ $PROJ_DIR$\..\obj\efm32_timer.pbi $PROJ_DIR$\..\obj\efm32_usart.pbi $PROJ_DIR$\..\obj\efm32_vcmp.pbi - $PROJ_DIR$\..\obj\core_cm3.lst $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h $PROJ_DIR$\..\obj\efm32_mpu.o $PROJ_DIR$\..\obj\efm32_msc.o @@ -263,6 +263,7 @@ $TOOLKIT_DIR$\inc\c\stdbool.h $PROJ_DIR$\..\bin\openbtl_olimex_efm32g880.srec $PROJ_DIR$\..\..\..\..\Source\file.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\lib\CMSIS\CM3\CoreSupport\core_cm3.c @@ -273,7 +274,7 @@ ICCARM - 116 97 + 75 97 @@ -292,7 +293,7 @@ BICOMP - 98 + 99 ICCARM @@ -323,10 +324,6 @@ - - BICOMP - 254 9 124 121 212 235 117 228 215 213 0 5 3 4 180 179 1 7 16 15 - ICCARM 254 9 124 121 212 235 117 228 215 213 0 5 3 4 180 179 1 7 16 15 @@ -384,7 +381,7 @@ ICCARM - 99 210 + 106 210 @@ -826,7 +823,7 @@ BICOMP - 110 + 111 ICCARM @@ -849,7 +846,7 @@ BICOMP - 111 + 112 ICCARM @@ -872,7 +869,7 @@ BICOMP - 112 + 113 ICCARM @@ -895,7 +892,7 @@ BICOMP - 113 + 114 ICCARM @@ -918,7 +915,7 @@ BICOMP - 114 + 115 ICCARM @@ -941,7 +938,7 @@ BICOMP - 115 + 116 ICCARM @@ -1001,7 +998,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1010,7 +1007,7 @@ BICOMP - 104 + 101 ICCARM @@ -1024,7 +1021,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 0 5 3 124 121 212 235 117 228 215 213 4 180 179 1 7 17 58 254 19 16 31 15 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 0 5 3 124 121 212 235 117 228 215 213 4 180 179 1 7 17 58 254 19 16 31 15 @@ -1033,7 +1030,7 @@ AARM - 107 + 108 @@ -1042,11 +1039,11 @@ BICOMP - 102 + 100 ICCARM - 109 108 + 110 109 @@ -1056,7 +1053,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1079,7 +1076,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1102,7 +1099,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 47 124 121 212 235 117 228 215 213 254 0 5 3 4 180 179 1 7 16 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 47 124 121 212 235 117 228 215 213 254 0 5 3 4 180 179 1 7 16 @@ -1125,7 +1122,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1134,11 +1131,11 @@ BICOMP - 105 + 104 ICCARM - 127 101 + 127 103 @@ -1148,7 +1145,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1157,7 +1154,7 @@ BICOMP - 106 + 107 ICCARM @@ -1171,7 +1168,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 0 5 3 124 121 212 235 117 228 215 213 4 180 179 1 7 19 254 16 31 15 43 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 0 5 3 124 121 212 235 117 228 215 213 4 180 179 1 7 19 254 16 31 15 43 @@ -1194,7 +1191,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1217,7 +1214,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1226,11 +1223,11 @@ BICOMP - 100 + 105 ICCARM - 103 187 + 102 187 @@ -1240,7 +1237,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1263,7 +1260,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 83 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 83 @@ -1286,7 +1283,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1309,7 +1306,7 @@ ICCARM - 89 81 85 67 94 73 93 78 77 80 87 256 91 96 + 89 81 85 257 94 73 93 78 77 80 87 256 91 96 @@ -1328,7 +1325,7 @@ ILINK - 217 130 193 187 188 192 97 200 107 166 168 167 210 122 226 227 146 147 148 149 172 171 170 169 164 165 118 119 144 145 178 176 177 174 173 175 143 125 201 131 186 199 120 101 202 108 190 185 142 128 141 + 217 130 193 187 188 192 97 200 108 166 168 167 210 122 226 227 146 147 148 149 172 171 170 169 164 165 118 119 144 145 178 176 177 174 173 175 143 125 201 131 186 199 120 103 202 109 190 185 142 128 141 diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.ewp b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.ewp index 9bfa8588..e2016805 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.ewp +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/efm32G880.ewp @@ -2067,7 +2067,7 @@ - $PROJ_DIR$\..\config.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\hooks.c diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/settings/efm32G880.wsdt b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/settings/efm32G880.wsdt index 3026048b..79ae3fe6 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/settings/efm32G880.wsdt +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Boot/ide/settings/efm32G880.wsdt @@ -29,7 +29,7 @@ - + TabID-3636-6432 @@ -41,7 +41,7 @@ - 0 + 0 TabID-28813-8212 @@ -57,7 +57,7 @@ TabID-20200-19078Debug LogDebug-Log - 0 + 0 @@ -70,7 +70,7 @@ - iaridepm.enu1-2-2393231-2-2126138125000240418231151688153-2-21361010-2-210121381003968240418125000240418 + iaridepm.enu1-2-2393231-2-2126138125000240418231151688153-2-21361010-2-210121381003968240418125000240418 diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/bin/demoprog_olimex_efm32g880.out b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/bin/demoprog_olimex_efm32g880.out index b90dda3b..380c077a 100644 Binary files a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/bin/demoprog_olimex_efm32g880.out and b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/bin/demoprog_olimex_efm32g880.out differ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/header.h b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/header.h index 9da251ac..04d7128b 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/header.h +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "efm32.h" /* EFM32 registers */ #include "efm32_chip.h" /* EFM32 chip initialization */ #include "efm32_cmu.h" /* EFM32 clock management */ diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/efm32G880.dep b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/efm32G880.dep index 9e193d4d..f35a742b 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/efm32G880.dep +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/efm32G880.dep @@ -91,13 +91,13 @@ $PROJ_DIR$\..\obj\main.o $TOOLKIT_DIR$\lib\shb_l.a $PROJ_DIR$\..\obj\boot.o - $PROJ_DIR$\..\obj\timer.o - $PROJ_DIR$\..\obj\cstart.o - $PROJ_DIR$\..\obj\boot.pbi $PROJ_DIR$\..\obj\vectors.o - $PROJ_DIR$\..\obj\timer.pbi $PROJ_DIR$\..\obj\main.pbi + $PROJ_DIR$\..\obj\timer.pbi + $PROJ_DIR$\..\obj\boot.pbi $PROJ_DIR$\..\obj\core_cm3.o + $PROJ_DIR$\..\obj\cstart.o + $PROJ_DIR$\..\obj\timer.o $PROJ_DIR$\..\obj\vectors.pbi $PROJ_DIR$\..\obj\boot.lst $PROJ_DIR$\..\obj\vectors.lst @@ -230,6 +230,7 @@ $PROJ_DIR$\..\obj\efm32_acmp.lst $PROJ_DIR$\..\obj\efm32_ebi.lst $PROJ_DIR$\..\obj\efm32_usart.lst + $PROJ_DIR$\..\..\Boot\blt_conf.h $PROJ_DIR$\..\lib\CMSIS\CM3\CoreSupport\core_cm3.c @@ -240,7 +241,7 @@ ICCARM - 178 91 + 178 89 @@ -290,6 +291,10 @@ + + BICOMP + 149 9 189 186 196 217 182 210 199 197 0 5 3 4 165 164 1 7 16 15 + ICCARM 149 9 189 186 196 217 182 210 199 197 0 5 3 4 165 164 1 7 16 15 @@ -309,10 +314,6 @@ - - BICOMP - 11 149 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 19 16 15 - ICCARM 11 149 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 19 16 15 @@ -458,7 +459,7 @@ BICOMP - 25 166 186 196 217 210 199 197 168 167 149 0 5 3 189 4 165 164 1 7 19 16 15 + 25 166 186 196 217 182 210 199 197 168 167 149 0 5 3 189 4 165 164 1 7 19 16 15 ICCARM @@ -481,7 +482,7 @@ BICOMP - 27 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 15 149 16 201 168 + 27 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 15 149 16 201 168 ICCARM @@ -504,7 +505,7 @@ BICOMP - 29 149 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 16 19 15 + 29 149 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 16 19 15 ICCARM @@ -527,7 +528,7 @@ BICOMP - 31 149 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 16 15 + 31 149 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 16 15 ICCARM @@ -550,7 +551,7 @@ BICOMP - 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 33 149 19 16 15 + 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 33 149 19 16 15 ICCARM @@ -573,7 +574,7 @@ BICOMP - 189 186 196 217 210 199 197 35 0 5 3 4 165 164 1 7 + 189 186 196 217 182 210 199 197 35 0 5 3 4 165 164 1 7 ICCARM @@ -596,7 +597,7 @@ BICOMP - 37 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 149 15 16 + 37 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 149 15 16 ICCARM @@ -619,7 +620,7 @@ BICOMP - 39 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 + 39 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 ICCARM @@ -642,7 +643,7 @@ BICOMP - 41 149 0 5 3 189 186 196 217 210 199 197 4 165 164 1 7 19 16 15 + 41 149 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 19 16 15 ICCARM @@ -977,7 +978,7 @@ BICOMP - 87 + 88 ICCARM @@ -991,7 +992,7 @@ ICCARM - 73 163 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 + 73 224 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 @@ -1000,7 +1001,7 @@ AARM - 86 + 90 @@ -1023,7 +1024,7 @@ ICCARM - 73 163 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 + 73 224 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 @@ -1046,7 +1047,7 @@ ICCARM - 73 163 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 + 73 224 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 @@ -1055,7 +1056,7 @@ BICOMP - 90 + 86 ICCARM @@ -1069,7 +1070,7 @@ ICCARM - 73 163 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 + 73 224 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 @@ -1078,11 +1079,11 @@ BICOMP - 89 + 87 ICCARM - 96 85 + 96 91 @@ -1092,7 +1093,7 @@ ICCARM - 73 163 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 + 73 224 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 @@ -1105,7 +1106,7 @@ ICCARM - 94 88 + 94 85 @@ -1115,7 +1116,7 @@ ICCARM - 73 163 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 + 73 224 0 5 3 189 186 196 217 182 210 199 197 4 165 164 1 7 17 58 149 19 16 31 15 43 71 75 77 68 80 @@ -1134,7 +1135,7 @@ ILINK - 155 84 91 86 125 127 126 194 187 208 209 105 106 107 108 131 130 129 128 123 124 183 184 102 103 137 135 136 133 132 134 101 104 159 152 160 82 185 85 88 83 100 97 99 + 155 84 89 90 125 127 126 194 187 208 209 105 106 107 108 131 130 129 128 123 124 183 184 102 103 137 135 136 133 132 134 101 104 159 152 160 82 185 91 85 83 100 97 99 @@ -1143,7 +1144,7 @@ BILINK - 87 98 109 110 111 112 113 114 115 116 117 118 119 120 121 122 141 142 143 144 145 146 147 169 170 173 174 175 176 177 148 161 150 162 90 180 89 92 + 88 98 109 110 111 112 113 114 115 116 117 118 119 120 121 122 141 142 143 144 145 146 147 169 170 173 174 175 176 177 148 161 150 162 86 180 87 92 diff --git a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/settings/efm32G880.wsdt b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/settings/efm32G880.wsdt index 1608b037..9a45e64e 100644 --- a/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/settings/efm32G880.wsdt +++ b/Target/Demo/ARMCM3_EFM32_Olimex_EM32G880F128STK_IAR/Prog/ide/settings/efm32G880.wsdt @@ -24,7 +24,7 @@ - + TabID-15953-11523 @@ -36,7 +36,7 @@ - 0 + 0 TabID-26827-12343 @@ -46,7 +46,7 @@ TabID-26138-18087Find in FilesFind-in-Files - 0 + 0 @@ -59,7 +59,7 @@ - iaridepm.enu1-2-2393228-2-2126138125000240418228175688153-2-21361010-2-210121381003968240418125000240418 + iaridepm.enu1-2-2393228-2-2126138125000240418228175688153-2-21361010-2-210121381003968240418125000240418 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.elf b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.elf index 2c19a739..7f24b4fc 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.elf and b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.elf differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.map b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.map index 370a950a..007a12d6 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.map +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/bin/openbtl_ek_lm3s6965.map @@ -1817,7 +1817,7 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/B .debug_frame 0x000039d0 0xa0 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le_small.a(user_libc.o) .debug_frame 0x00003a70 0x600 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libm_v7m_t_le_small.a(libm_asm.o) -.debug_info 0x00000000 0x91b8 +.debug_info 0x00000000 0x91b9 .debug_info 0x00000000 0xa06 THUMB Debug/../../obj/sysctl.o .debug_info 0x00000a06 0x427 THUMB Debug/../../obj/interrupt.o .debug_info 0x00000e2d 0x110 THUMB Debug/../../obj/cpulib.o @@ -1826,28 +1826,28 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/B .debug_info 0x00001efc 0xbb2 THUMB Debug/../../obj/uartlib.o .debug_info 0x00002aae 0x5d5 THUMB Debug/../../obj/ssi.o .debug_info 0x00003083 0x6a3 THUMB Debug/../../obj/mmc.o - .debug_info 0x00003726 0x4f5 THUMB Debug/../../obj/hooks.o - .debug_info 0x00003c1b 0x97 THUMB Debug/../../obj/main.o - .debug_info 0x00003cb2 0xfd THUMB Debug/../../obj/cstart.o - .debug_info 0x00003daf 0xf7 THUMB Debug/../../obj/vectors.o - .debug_info 0x00003ea6 0x140 THUMB Debug/../../obj/cpu.o - .debug_info 0x00003fe6 0x673 THUMB Debug/../../obj/flash.o - .debug_info 0x00004659 0x161 THUMB Debug/../../obj/nvm.o - .debug_info 0x000047ba 0x133 THUMB Debug/../../obj/timer.o - .debug_info 0x000048ed 0x271 THUMB Debug/../../obj/uart.o - .debug_info 0x00004b5e 0xeb THUMB Debug/../../obj/assert.o - .debug_info 0x00004c49 0xc7 THUMB Debug/../../obj/backdoor.o - .debug_info 0x00004d10 0x8f THUMB Debug/../../obj/boot.o - .debug_info 0x00004d9f 0x1ba THUMB Debug/../../obj/com.o - .debug_info 0x00004f59 0x8d THUMB Debug/../../obj/cop.o - .debug_info 0x00004fe6 0x5e8 THUMB Debug/../../obj/xcp.o - .debug_info 0x000055ce 0x2500 THUMB Debug/../../obj/ff.o - .debug_info 0x00007ace 0x160 THUMB Debug/../../obj/unicode.o - .debug_info 0x00007c2e 0x868 THUMB Debug/../../obj/file.o - .debug_info 0x00008496 0xc55 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le_small.a(libc2.o) - .debug_info 0x000090eb 0xcd C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le_small.a(user_libc.o) + .debug_info 0x00003726 0x4f6 THUMB Debug/../../obj/hooks.o + .debug_info 0x00003c1c 0x97 THUMB Debug/../../obj/main.o + .debug_info 0x00003cb3 0xfd THUMB Debug/../../obj/cstart.o + .debug_info 0x00003db0 0xf7 THUMB Debug/../../obj/vectors.o + .debug_info 0x00003ea7 0x140 THUMB Debug/../../obj/cpu.o + .debug_info 0x00003fe7 0x673 THUMB Debug/../../obj/flash.o + .debug_info 0x0000465a 0x161 THUMB Debug/../../obj/nvm.o + .debug_info 0x000047bb 0x133 THUMB Debug/../../obj/timer.o + .debug_info 0x000048ee 0x271 THUMB Debug/../../obj/uart.o + .debug_info 0x00004b5f 0xeb THUMB Debug/../../obj/assert.o + .debug_info 0x00004c4a 0xc7 THUMB Debug/../../obj/backdoor.o + .debug_info 0x00004d11 0x8f THUMB Debug/../../obj/boot.o + .debug_info 0x00004da0 0x1ba THUMB Debug/../../obj/com.o + .debug_info 0x00004f5a 0x8d THUMB Debug/../../obj/cop.o + .debug_info 0x00004fe7 0x5e8 THUMB Debug/../../obj/xcp.o + .debug_info 0x000055cf 0x2500 THUMB Debug/../../obj/ff.o + .debug_info 0x00007acf 0x160 THUMB Debug/../../obj/unicode.o + .debug_info 0x00007c2f 0x868 THUMB Debug/../../obj/file.o + .debug_info 0x00008497 0xc55 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le_small.a(libc2.o) + .debug_info 0x000090ec 0xcd C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le_small.a(user_libc.o) -.debug_abbrev 0x00000000 0x1edf +.debug_abbrev 0x00000000 0x1eee .debug_abbrev 0x00000000 0x1c5 THUMB Debug/../../obj/sysctl.o .debug_abbrev 0x000001c5 0x13d THUMB Debug/../../obj/interrupt.o .debug_abbrev 0x00000302 0xa8 THUMB Debug/../../obj/cpulib.o @@ -1856,26 +1856,26 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/B .debug_abbrev 0x0000065b 0x177 THUMB Debug/../../obj/uartlib.o .debug_abbrev 0x000007d2 0x16d THUMB Debug/../../obj/ssi.o .debug_abbrev 0x0000093f 0x2a1 THUMB Debug/../../obj/mmc.o - .debug_abbrev 0x00000be0 0x14e THUMB Debug/../../obj/hooks.o - .debug_abbrev 0x00000d2e 0x5f THUMB Debug/../../obj/main.o - .debug_abbrev 0x00000d8d 0x14 THUMB Debug/../../obj/cstart.o - .debug_abbrev 0x00000da1 0xbe THUMB Debug/../../obj/vectors.o - .debug_abbrev 0x00000e5f 0xaf THUMB Debug/../../obj/cpu.o - .debug_abbrev 0x00000f0e 0x22e THUMB Debug/../../obj/flash.o - .debug_abbrev 0x0000113c 0xba THUMB Debug/../../obj/nvm.o - .debug_abbrev 0x000011f6 0xe8 THUMB Debug/../../obj/timer.o - .debug_abbrev 0x000012de 0x161 THUMB Debug/../../obj/uart.o - .debug_abbrev 0x0000143f 0x7c THUMB Debug/../../obj/assert.o - .debug_abbrev 0x000014bb 0x5b THUMB Debug/../../obj/backdoor.o - .debug_abbrev 0x00001516 0x3f THUMB Debug/../../obj/boot.o - .debug_abbrev 0x00001555 0xe0 THUMB Debug/../../obj/com.o - .debug_abbrev 0x00001635 0x3f THUMB Debug/../../obj/cop.o - .debug_abbrev 0x00001674 0x1cb THUMB Debug/../../obj/xcp.o - .debug_abbrev 0x0000183f 0x315 THUMB Debug/../../obj/ff.o - .debug_abbrev 0x00001b54 0xa5 THUMB Debug/../../obj/unicode.o - .debug_abbrev 0x00001bf9 0x1f8 THUMB Debug/../../obj/file.o - .debug_abbrev 0x00001df1 0xc9 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le_small.a(libc2.o) - .debug_abbrev 0x00001eba 0x25 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le_small.a(user_libc.o) + .debug_abbrev 0x00000be0 0x15d THUMB Debug/../../obj/hooks.o + .debug_abbrev 0x00000d3d 0x5f THUMB Debug/../../obj/main.o + .debug_abbrev 0x00000d9c 0x14 THUMB Debug/../../obj/cstart.o + .debug_abbrev 0x00000db0 0xbe THUMB Debug/../../obj/vectors.o + .debug_abbrev 0x00000e6e 0xaf THUMB Debug/../../obj/cpu.o + .debug_abbrev 0x00000f1d 0x22e THUMB Debug/../../obj/flash.o + .debug_abbrev 0x0000114b 0xba THUMB Debug/../../obj/nvm.o + .debug_abbrev 0x00001205 0xe8 THUMB Debug/../../obj/timer.o + .debug_abbrev 0x000012ed 0x161 THUMB Debug/../../obj/uart.o + .debug_abbrev 0x0000144e 0x7c THUMB Debug/../../obj/assert.o + .debug_abbrev 0x000014ca 0x5b THUMB Debug/../../obj/backdoor.o + .debug_abbrev 0x00001525 0x3f THUMB Debug/../../obj/boot.o + .debug_abbrev 0x00001564 0xe0 THUMB Debug/../../obj/com.o + .debug_abbrev 0x00001644 0x3f THUMB Debug/../../obj/cop.o + .debug_abbrev 0x00001683 0x1cb THUMB Debug/../../obj/xcp.o + .debug_abbrev 0x0000184e 0x315 THUMB Debug/../../obj/ff.o + .debug_abbrev 0x00001b63 0xa5 THUMB Debug/../../obj/unicode.o + .debug_abbrev 0x00001c08 0x1f8 THUMB Debug/../../obj/file.o + .debug_abbrev 0x00001e00 0xc9 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le_small.a(libc2.o) + .debug_abbrev 0x00001ec9 0x25 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le_small.a(user_libc.o) .debug_loc 0x00000000 0xa049 .debug_loc 0x00000000 0x9fa THUMB Debug/../../obj/sysctl.o diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/config.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/config.h rename to Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h index edb0cbb7..5ff1e5fd 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/config.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_LM3S_EK_LM3S6965_Crossworks\Boot\config.h +* \file Demo\ARMCM3_LM3S_EK_LM3S6965_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_LM3S_EK_LM3S6965_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -164,5 +164,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzp b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzp index 7c808845..c0970f66 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzp +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzp @@ -6,7 +6,7 @@ - + @@ -42,9 +42,9 @@ - + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzs b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzs index c09b455d..d2655296 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzs +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/ide/lm3s6965_crossworks.hzs @@ -19,8 +19,8 @@ - - + + @@ -51,8 +51,8 @@ - - + + - + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/header.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/header.h index 94f67a3c..aa402547 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/header.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ #include "led.h" /* LED driver */ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/ide/lm3s6965_crossworks.hzs b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/ide/lm3s6965_crossworks.hzs index 996a8ac0..93804f9d 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/ide/lm3s6965_crossworks.hzs +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Prog/ide/lm3s6965_crossworks.hzs @@ -51,8 +51,8 @@ - - + + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.elf b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.elf index 86fa4e74..f71f5239 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.elf and b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.elf differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.map b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.map index e88027d0..e43aeb56 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.map +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/bin/openbtl_ek_lm3s6965.map @@ -20,25 +20,25 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, DATA 2 .bss 0000114c 20000008 00004be0 00010008 2**2 ALLOC - 3 .debug_info 0000d7ab 00000000 00000000 00010008 2**0 + 3 .debug_info 0000d7ac 00000000 00000000 00010008 2**0 CONTENTS, READONLY, DEBUGGING - 4 .debug_abbrev 00002641 00000000 00000000 0001d7b3 2**0 + 4 .debug_abbrev 00002650 00000000 00000000 0001d7b4 2**0 CONTENTS, READONLY, DEBUGGING - 5 .debug_loc 0000a773 00000000 00000000 0001fdf4 2**0 + 5 .debug_loc 0000a773 00000000 00000000 0001fe04 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_aranges 00000ba0 00000000 00000000 0002a567 2**0 + 6 .debug_aranges 00000ba0 00000000 00000000 0002a577 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_ranges 00001008 00000000 00000000 0002b107 2**0 + 7 .debug_ranges 00001008 00000000 00000000 0002b117 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_line 0000414b 00000000 00000000 0002c10f 2**0 + 8 .debug_line 0000414b 00000000 00000000 0002c11f 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_str 0000249e 00000000 00000000 0003025a 2**0 + 9 .debug_str 0000249e 00000000 00000000 0003026a 2**0 CONTENTS, READONLY, DEBUGGING - 10 .comment 00000030 00000000 00000000 000326f8 2**0 + 10 .comment 00000030 00000000 00000000 00032708 2**0 CONTENTS, READONLY - 11 .ARM.attributes 00000033 00000000 00000000 00032728 2**0 + 11 .ARM.attributes 00000033 00000000 00000000 00032738 2**0 CONTENTS, READONLY - 12 .debug_frame 000023a0 00000000 00000000 0003275c 2**2 + 12 .debug_frame 000023a0 00000000 00000000 0003276c 2**2 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 00000000 l d .text 00000000 .text diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/config.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/config.h rename to Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h index 9cb14c50..209f8fe5 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/config.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_LM3S_EK_LM3S6965_GCC\Boot\config.h +* \file Demo\ARMCM3_LM3S_EK_LM3S6965_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_LM3S_EK_LM3S6965_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -164,5 +164,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/ide/DemoBoot.project index ab881f9c..bac0638e 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/ide/DemoBoot.project @@ -67,9 +67,9 @@ - + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/makefile b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/makefile index 02a5e695..34fb915b 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/makefile +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_ek_lm3s6965 #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ ./lib/inc/hw_flash.h \ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Prog/header.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Prog/header.h index e19b23c8..26189e05 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Prog/header.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ #include "led.h" /* LED driver */ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/bin/openbtl_ek_lm3s6965.out b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/bin/openbtl_ek_lm3s6965.out index 1af4cdce..4361692d 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/bin/openbtl_ek_lm3s6965.out and b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/bin/openbtl_ek_lm3s6965.out differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/config.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/config.h rename to Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h index ea3788c1..b48283f6 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/config.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_LM3S_EK_LM3S6965_IAR\Boot\config.h +* \file Demo\ARMCM3_LM3S_EK_LM3S6965_IAR\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_LM3S_EK_LM3S6965_IAR * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -166,5 +166,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.dep b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.dep index 99105fb6..bed0b2de 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.dep +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.dep @@ -2,7 +2,7 @@ 2 - 2644682914 + 1465485539 Debug @@ -72,13 +72,13 @@ $PROJ_DIR$\..\obj\file.lst $PROJ_DIR$\..\obj\ssi.lst $PROJ_DIR$\..\obj\filesys.o - $PROJ_DIR$\..\obj\unicode.lst - $PROJ_DIR$\..\..\..\..\Source\filesys.c - $PROJ_DIR$\..\obj\led.lst $PROJ_DIR$\..\obj\led.pbi - $PROJ_DIR$\..\..\..\..\Source\filesys.h $PROJ_DIR$\..\..\..\..\Source\fatfs\src\option\ccsbcs.c + $PROJ_DIR$\..\..\..\..\Source\filesys.h + $PROJ_DIR$\..\obj\led.lst $PROJ_DIR$\..\obj\filesys.lst + $PROJ_DIR$\..\..\..\..\Source\filesys.c + $PROJ_DIR$\..\obj\unicode.lst $PROJ_DIR$\..\obj\unicode.pbi $PROJ_DIR$\..\obj\unicode.o $TOOLKIT_DIR$\inc\c\ctype.h @@ -120,8 +120,8 @@ $PROJ_DIR$\..\obj\hooks.o $PROJ_DIR$\..\obj\com.o $PROJ_DIR$\..\obj\flash.lst - $PROJ_DIR$\..\..\..\..\Source\ARMCM3_LM3S\IAR\memory.x $PROJ_DIR$\..\obj\backdoor.lst + $PROJ_DIR$\..\..\..\..\Source\ARMCM3_LM3S\IAR\memory.x $PROJ_DIR$\..\obj\cpu.lst $PROJ_DIR$\..\obj\hooks.pbi $PROJ_DIR$\..\obj\uart.lst @@ -186,6 +186,7 @@ $PROJ_DIR$\..\obj\cpulib.pbi $PROJ_DIR$\..\obj\gpio.pbi $PROJ_DIR$\..\obj\interrupt.pbi + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\lib\driverlib\cpulib.c @@ -225,11 +226,11 @@ BICOMP - 18 20 24 25 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 1 8 + 18 20 24 25 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 1 8 ICCARM - 18 20 24 25 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 1 8 + 18 20 24 25 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 1 8 @@ -248,11 +249,11 @@ BICOMP - 19 20 21 24 25 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 6 9 8 + 19 20 21 24 25 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 6 9 8 ICCARM - 19 20 21 24 25 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 6 9 8 + 19 20 21 24 25 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 6 9 8 @@ -271,11 +272,11 @@ BICOMP - 20 22 25 0 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 + 20 22 25 0 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 8 ICCARM - 20 22 25 0 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 + 20 22 25 0 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 8 @@ -292,13 +293,9 @@ - - BICOMP - 20 21 23 25 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 11 13 - ICCARM - 20 21 23 25 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 11 13 + 20 21 23 25 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 8 11 13 @@ -317,11 +314,11 @@ BICOMP - 20 22 24 25 0 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 13 + 20 22 24 25 0 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 8 13 ICCARM - 20 22 24 25 0 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 13 + 20 22 24 25 0 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 8 13 @@ -340,7 +337,7 @@ ICCARM - 20 21 24 25 26 3 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 8 15 13 + 20 21 24 25 26 3 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 8 15 13 @@ -359,11 +356,11 @@ BICOMP - 21 25 6 9 11 13 44 47 53 41 49 27 60 34 57 38 36 40 51 59 45 16 55 62 + 21 25 6 9 11 13 44 47 53 41 49 180 60 34 57 38 36 40 51 59 45 16 55 62 ICCARM - 21 25 6 9 11 13 44 47 53 41 49 27 60 34 57 38 36 40 51 59 45 16 55 62 + 21 25 6 9 11 13 44 47 53 41 49 180 60 34 57 38 36 40 51 59 45 16 55 62 @@ -391,11 +388,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 15 13 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 15 13 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 15 13 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 15 13 @@ -414,11 +411,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 20 21 22 24 25 13 6 9 15 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 20 21 22 24 25 13 6 9 15 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 20 21 22 24 25 13 6 9 15 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 20 21 22 24 25 13 6 9 15 @@ -437,11 +434,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -492,11 +489,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -515,11 +512,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 1 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 1 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 1 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 1 @@ -538,11 +535,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -561,11 +558,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -584,11 +581,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 13 15 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 13 15 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 13 15 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 21 25 13 15 @@ -601,17 +598,17 @@ ICCARM - 66 74 + 72 74 BICOMP - 45 47 16 71 + 45 47 16 67 ICCARM - 45 47 16 71 + 45 47 16 67 @@ -630,11 +627,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -647,17 +644,17 @@ ICCARM - 115 163 + 114 163 BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -676,11 +673,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -699,11 +696,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 43 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 43 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 43 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 43 @@ -722,11 +719,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -745,11 +742,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 169 157 155 127 77 156 79 92 128 170 75 154 76 125 126 129 78 153 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 169 157 155 127 77 156 79 92 128 170 75 154 76 125 126 129 78 153 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 169 157 155 127 77 156 79 92 128 170 75 154 76 125 126 129 78 153 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 169 157 155 127 77 156 79 92 128 170 75 154 76 125 126 129 78 153 @@ -768,11 +765,11 @@ BICOMP - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 59 45 47 16 55 62 + 53 41 49 180 60 34 57 38 36 40 51 59 45 47 16 55 62 @@ -785,17 +782,17 @@ ICCARM - 72 65 + 70 65 BICOMP - 53 41 49 27 60 34 57 38 36 40 51 70 45 47 132 55 62 + 53 41 49 27 60 34 57 38 36 40 51 68 45 47 132 55 62 ICCARM - 53 41 49 27 60 34 57 38 36 40 51 70 45 47 132 55 62 + 53 41 49 27 60 34 57 38 36 40 51 68 45 47 132 55 62 @@ -804,11 +801,11 @@ BICOMP - 69 + 66 ICCARM - 68 108 + 69 108 @@ -837,7 +834,7 @@ ILINK - 114 110 163 160 112 164 94 102 131 151 146 137 171 172 111 173 159 105 93 149 174 136 82 175 74 139 162 158 122 144 121 + 115 110 163 160 112 164 94 102 131 151 146 137 171 172 111 173 159 105 93 149 174 136 82 175 74 139 162 158 122 144 121 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.ewp b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.ewp index 9b9d2912..040eaaee 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.ewp +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/lm3s6965.ewp @@ -1939,7 +1939,7 @@ - $PROJ_DIR$\..\config.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\hooks.c diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/settings/lm3s6965.wsdt b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/settings/lm3s6965.wsdt index 3461b879..41be2012 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/settings/lm3s6965.wsdt +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/ide/settings/lm3s6965.wsdt @@ -17,7 +17,7 @@ 300Find-in-Files2011553087730055278946300FileFunctionLine200700100300BuildFind-in-FilesFind-All-References664941138300BuildFind-in-Files664941138 - + TabID-31649-22318 @@ -29,20 +29,20 @@ - 0TabID-25743-19564BuildBuild0 + 0TabID-25743-19564BuildBuild0 - TextEditor$WS_DIR$\..\config.h000006457765776TextEditor$WS_DIR$\..\hooks.c000003051564315643TextEditor$WS_DIR$\..\main.c0000044298729872TextEditor$WS_DIR$\..\..\..\..\Source\file.h00000818241824TextEditor$WS_DIR$\..\..\..\..\Source\file.c0000010761636163TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\cpu.c0000050384538450100000010000001 + TextEditor$WS_DIR$\..\hooks.c000003051564315643TextEditor$WS_DIR$\..\main.c000004429872987TextEditor$WS_DIR$\..\..\..\..\Source\file.h000008182418242TextEditor$WS_DIR$\..\..\..\..\Source\file.c0000010761636163TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\cpu.c0000050384538450100000010000001 - iaridepm.enu1-2-2529212-2-2151169149802294425212302925087-2-2529265-2-212121381202381240418264881925087 + iaridepm.enu1-2-2529212-2-2151169149802294425212302925087-2-2529265-2-212121381202381240418264881925087 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/bin/demoprog_ek_lm3s6965.out b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/bin/demoprog_ek_lm3s6965.out index 22e0cc66..5b8bdff9 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/bin/demoprog_ek_lm3s6965.out and b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/bin/demoprog_ek_lm3s6965.out differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/header.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/header.h index 007f7a45..580c0b77 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/header.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ #include "led.h" /* LED driver */ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/lm3s6965.dep b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/lm3s6965.dep index 026fb047..74f5efd8 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/lm3s6965.dep +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/lm3s6965.dep @@ -81,16 +81,20 @@ $PROJ_DIR$\..\irq.h $PROJ_DIR$\..\led.c $PROJ_DIR$\..\led.h - $PROJ_DIR$\..\obj\stm32f10x_gpio.pbi + $PROJ_DIR$\..\main.c + $PROJ_DIR$\..\time.c + $PROJ_DIR$\..\time.h + $PROJ_DIR$\..\vectors.c $PROJ_DIR$\..\obj\system_stm32f10x.pbi + $PROJ_DIR$\..\obj\stm32f10x_gpio.pbi $PROJ_DIR$\..\obj\adc.lst - $PROJ_DIR$\..\obj\epi.lst - $PROJ_DIR$\..\obj\gpio.lst - $PROJ_DIR$\..\obj\ethernet.lst $PROJ_DIR$\..\obj\demoprog_ek_lm3s6965.map - $TOOLKIT_DIR$\lib\dl7M_tln.a $PROJ_DIR$\..\obj\stm32f10x_crc.o + $TOOLKIT_DIR$\lib\dl7M_tln.a + $PROJ_DIR$\..\obj\ethernet.lst $PROJ_DIR$\..\obj\stm32f10x_fsmc.o + $PROJ_DIR$\..\obj\gpio.lst + $PROJ_DIR$\..\obj\epi.lst $PROJ_DIR$\..\obj\core_cm3.o $PROJ_DIR$\..\bin\demoprog_ek_lm3s6965.srec $PROJ_DIR$\..\obj\cstart.o @@ -138,10 +142,6 @@ $PROJ_DIR$\..\obj\i2s.lst $PROJ_DIR$\..\obj\cpu.lst $PROJ_DIR$\..\obj\comp.lst - $PROJ_DIR$\..\main.c - $PROJ_DIR$\..\time.c - $PROJ_DIR$\..\time.h - $PROJ_DIR$\..\vectors.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c @@ -192,9 +192,9 @@ $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c @@ -258,6 +258,7 @@ $PROJ_DIR$\..\obj\boot.pbi $PROJ_DIR$\..\obj\stm32f10x_pwr.pbi $PROJ_DIR$\..\obj\stm32f10x_sdio.pbi + $PROJ_DIR$\..\..\Boot\blt_conf.h $PROJ_DIR$\..\lib\driverlib\cpu.c @@ -268,7 +269,7 @@ ICCARM - 130 172 + 134 172 @@ -291,7 +292,7 @@ ICCARM - 77 200 + 81 200 @@ -314,7 +315,7 @@ ICCARM - 131 201 + 135 201 @@ -337,7 +338,7 @@ ICCARM - 78 173 + 88 173 @@ -360,14 +361,10 @@ ICCARM - 80 197 + 85 197 - - BICOMP - 48 54 55 62 6 10 32 22 - ICCARM 48 54 55 62 6 10 32 22 @@ -383,7 +380,7 @@ ICCARM - 97 204 + 101 204 @@ -406,7 +403,7 @@ ICCARM - 79 205 + 87 205 @@ -452,7 +449,7 @@ ICCARM - 91 207 + 95 207 @@ -475,7 +472,7 @@ ICCARM - 129 208 + 133 208 @@ -490,7 +487,7 @@ ILINK - 224 81 + 224 82 @@ -503,7 +500,7 @@ ICCARM - 128 209 + 132 209 @@ -779,17 +776,17 @@ ICCARM - 150 122 + 150 126 BICOMP - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 ICCARM - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 @@ -798,7 +795,7 @@ AARM - 87 + 91 @@ -811,17 +808,17 @@ ICCARM - 155 119 + 155 123 BICOMP - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 149 68 72 74 77 54 55 56 60 62 32 14 38 22 34 ICCARM - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 @@ -834,29 +831,20 @@ ICCARM - 147 121 + 147 125 BICOMP - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 149 68 72 74 77 54 55 56 60 62 32 14 38 22 34 ICCARM - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 - - $PROJ_DIR$\..\bin\demoprog_olimex_stm32p103.out - - - OBJCOPY - 124 - - - $PROJ_DIR$\..\main.c @@ -866,17 +854,17 @@ ICCARM - 151 120 + 151 124 BICOMP - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 149 68 72 74 77 54 55 56 60 62 32 14 38 22 34 ICCARM - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 @@ -885,21 +873,21 @@ BICOMP - 127 + 131 ICCARM - 202 126 + 202 130 BICOMP - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 149 68 72 74 77 54 55 56 60 62 32 14 38 22 34 ICCARM - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 @@ -918,14 +906,23 @@ BICOMP - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 149 68 72 74 77 54 55 56 60 62 32 14 38 22 34 ICCARM - 70 149 68 72 74 134 54 55 56 60 62 32 14 38 22 34 + 70 252 68 72 74 77 54 55 56 60 62 32 14 38 22 34 + + $PROJ_DIR$\..\bin\demoprog_olimex_stm32p103.out + + + OBJCOPY + 128 + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c @@ -935,7 +932,7 @@ ICCARM - 109 + 113 @@ -948,7 +945,7 @@ ICCARM - 108 + 112 @@ -961,7 +958,7 @@ ICCARM - 110 + 114 @@ -987,7 +984,7 @@ ICCARM - 111 + 115 @@ -996,11 +993,11 @@ BICOMP - 76 + 79 ICCARM - 114 + 118 @@ -1013,7 +1010,7 @@ ICCARM - 112 + 116 @@ -1026,7 +1023,7 @@ ICCARM - 113 + 117 @@ -1035,11 +1032,11 @@ BICOMP - 95 + 99 ICCARM - 92 + 96 @@ -1048,11 +1045,11 @@ BICOMP - 93 + 97 ICCARM - 117 + 121 @@ -1061,11 +1058,11 @@ BICOMP - 90 + 94 ICCARM - 89 + 93 @@ -1074,11 +1071,11 @@ BICOMP - 99 + 103 ICCARM - 100 + 104 @@ -1087,7 +1084,7 @@ BICOMP - 88 + 92 ICCARM @@ -1100,7 +1097,7 @@ BICOMP - 94 + 98 ICCARM @@ -1113,7 +1110,7 @@ BICOMP - 98 + 102 ICCARM @@ -1160,32 +1157,6 @@ - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c - - - BICOMP - 116 - - - ICCARM - 96 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c - - - BICOMP - 115 - - - ICCARM - 85 - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c @@ -1195,7 +1166,33 @@ ICCARM - 84 + 86 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c + + + BICOMP + 120 + + + ICCARM + 100 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c + + + BICOMP + 119 + + + ICCARM + 89 @@ -1204,11 +1201,11 @@ BICOMP - 75 + 80 ICCARM - 103 + 107 @@ -1217,11 +1214,11 @@ BICOMP - 101 + 105 ICCARM - 104 + 108 @@ -1234,7 +1231,7 @@ ICCARM - 105 + 109 @@ -1247,7 +1244,7 @@ ICCARM - 106 + 110 @@ -1260,7 +1257,7 @@ ICCARM - 107 + 111 @@ -1269,17 +1266,17 @@ ILINK - 81 + 82 OBJCOPY - 86 + 90 ILINK - 243 200 122 201 172 87 173 197 204 205 206 207 208 209 119 121 120 210 211 212 213 214 215 126 248 216 217 218 247 219 118 102 159 82 + 243 200 126 201 172 91 173 197 204 205 206 207 208 209 123 125 124 210 211 212 213 214 215 130 248 216 217 218 247 219 122 106 159 84 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/settings/lm3s6965.wsdt b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/settings/lm3s6965.wsdt index a3ada924..85c00136 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/settings/lm3s6965.wsdt +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Prog/ide/settings/lm3s6965.wsdt @@ -35,7 +35,7 @@ - + TabID-27300-28131 @@ -47,7 +47,7 @@ - 0TabID-14407-15370BuildBuild0 + 0TabID-14407-15370BuildBuild0 @@ -60,7 +60,7 @@ - iaridepm.enu1-2-2392241-2-2126139125000242160241071686411-2-21371010-2-210121391003968242160125000242160 + iaridepm.enu1-2-2392241-2-2126139125000242160241071686411-2-21371010-2-210121391003968242160125000242160 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/bin/openbtl_ek_lm3s8962.elf b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/bin/openbtl_ek_lm3s8962.elf index d9637853..e492a2ef 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/bin/openbtl_ek_lm3s8962.elf and b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/bin/openbtl_ek_lm3s8962.elf differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/config.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/config.h rename to Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/blt_conf.h index 2c0855c7..cc93f45b 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/config.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_LM3S_EK_LM3S8962_Crossworks\Boot\config.h +* \file Demo\ARMCM3_LM3S_EK_LM3S8962_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_LM3S_EK_LM3S8962_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -155,5 +155,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzp b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzp index 515850d5..9dcebdf2 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzp +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzp @@ -6,7 +6,7 @@ - + @@ -37,9 +37,9 @@ - + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzs b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzs index 509f8d6e..b1f1c4f4 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzs +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Boot/ide/lm3s8962_crossworks.hzs @@ -51,7 +51,7 @@ - + - + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/header.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/header.h index 02698ee1..aa7ccaa8 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/header.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ #include "led.h" /* LED driver */ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/ide/lm3s8962_crossworks.hzs b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/ide/lm3s8962_crossworks.hzs index 5c9ed11b..fa3ab9f2 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/ide/lm3s8962_crossworks.hzs +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/ide/lm3s8962_crossworks.hzs @@ -51,7 +51,7 @@ - + diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/bin/openbtl_ek_lm3s8962.elf b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/bin/openbtl_ek_lm3s8962.elf index f42aebf2..a046f730 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/bin/openbtl_ek_lm3s8962.elf and b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/bin/openbtl_ek_lm3s8962.elf differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/config.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/config.h rename to Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/blt_conf.h index 08196235..be8d731c 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/config.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_LM3S_EK_LM3S8962_GCC\Boot\config.h +* \file Demo\ARMCM3_LM3S_EK_LM3S8962_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_LM3S_EK_LM3S8962_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -155,5 +155,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/ide/DemoBoot.project index 1f70a5df..e0d5657f 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/ide/DemoBoot.project @@ -1,5 +1,10 @@ + + + + + @@ -67,17 +72,12 @@ - + - - - - - diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/makefile b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/makefile index 38a512ba..1be1ceb5 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/makefile +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_ek_lm3s8962 #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ ./lib/inc/hw_flash.h \ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Prog/header.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Prog/header.h index 09e6e7d8..edaa6015 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Prog/header.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ #include "led.h" /* LED driver */ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/bin/openbtl_ek_lm3s8962.out b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/bin/openbtl_ek_lm3s8962.out index 471caa9f..a7eaecd3 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/bin/openbtl_ek_lm3s8962.out and b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/bin/openbtl_ek_lm3s8962.out differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/config.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/config.h rename to Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/blt_conf.h index 13cec3cf..83f5d4c0 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/config.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_LM3S_EK_LM3S8962_IAR\Boot\config.h +* \file Demo\ARMCM3_LM3S_EK_LM3S8962_IAR\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_LM3S_EK_LM3S8962_IAR * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -157,5 +157,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.dep b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.dep index 825a2c7b..247f73a6 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.dep +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.dep @@ -2,7 +2,7 @@ 2 - 731047147 + 255714169 Debug @@ -64,13 +64,13 @@ $TOOLKIT_DIR$\lib\shb_l.a $PROJ_DIR$\..\obj\main.o $PROJ_DIR$\..\obj\boot.o - $PROJ_DIR$\..\obj\xcp.o - $PROJ_DIR$\..\obj\backdoor.o - $PROJ_DIR$\..\obj\assert.pbi - $PROJ_DIR$\..\obj\cop.o $PROJ_DIR$\..\obj\com.o - $PROJ_DIR$\..\obj\backdoor.pbi $PROJ_DIR$\..\obj\com.pbi + $PROJ_DIR$\..\obj\backdoor.pbi + $PROJ_DIR$\..\obj\cop.o + $PROJ_DIR$\..\obj\assert.pbi + $PROJ_DIR$\..\obj\backdoor.o + $PROJ_DIR$\..\obj\xcp.o $PROJ_DIR$\..\obj\cop.pbi $PROJ_DIR$\..\obj\xcp.pbi $PROJ_DIR$\..\obj\xcp.lst @@ -91,8 +91,8 @@ $PROJ_DIR$\..\obj\sysctl.o $PROJ_DIR$\..\obj\uartlib.o $PROJ_DIR$\..\obj\flashlib.pbi - $PROJ_DIR$\..\..\..\..\Source\ARMCM3_LM3S\IAR\memory.x $PROJ_DIR$\..\obj\cpulib.pbi + $PROJ_DIR$\..\..\..\..\Source\ARMCM3_LM3S\IAR\memory.x $PROJ_DIR$\..\obj\gpio.pbi $PROJ_DIR$\..\obj\interrupt.pbi $PROJ_DIR$\..\obj\sysctl.pbi @@ -141,6 +141,7 @@ $PROJ_DIR$\..\bin\openbtl_ek_lm3s8962.srec $PROJ_DIR$\..\bin\openbtl_ek_lm3s8962.out $PROJ_DIR$\..\..\..\..\Source\file.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\lib\driverlib\canlib.c @@ -157,11 +158,11 @@ BICOMP - 15 18 20 19 22 0 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 + 15 18 20 19 22 0 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 ICCARM - 15 18 20 19 22 0 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 + 15 18 20 19 22 0 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 @@ -170,7 +171,7 @@ BICOMP - 86 + 85 ICCARM @@ -203,11 +204,11 @@ BICOMP - 16 18 21 22 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 6 10 + 16 18 21 22 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 6 10 ICCARM - 16 18 21 22 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 6 10 + 16 18 21 22 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 6 10 @@ -226,11 +227,11 @@ BICOMP - 17 18 19 21 22 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 8 10 + 17 18 19 21 22 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 8 10 ICCARM - 17 18 19 21 22 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 8 10 + 17 18 19 21 22 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 8 10 @@ -249,11 +250,11 @@ BICOMP - 18 20 22 4 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 + 18 20 22 4 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 ICCARM - 18 20 22 4 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 + 18 20 22 4 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 @@ -270,9 +271,13 @@ + + BICOMP + 18 20 21 22 4 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 12 + ICCARM - 18 20 21 22 4 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 12 + 18 20 21 22 4 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 12 @@ -291,11 +296,11 @@ BICOMP - 18 19 21 22 23 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 14 12 + 18 19 21 22 23 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 14 12 ICCARM - 18 19 21 22 23 1 47 40 43 24 52 33 51 37 35 39 45 134 49 54 10 14 12 + 18 19 21 22 23 1 47 40 43 135 52 33 51 37 35 39 45 134 49 54 10 14 12 @@ -321,13 +326,9 @@ - - BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 - ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -346,11 +347,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 18 19 20 21 22 12 8 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 18 19 20 21 22 12 8 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 18 19 20 21 22 12 8 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 18 19 20 21 22 12 8 @@ -369,11 +370,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -391,7 +392,7 @@ BICOMP - 60 + 62 ICCARM @@ -401,11 +402,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -424,11 +425,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 19 22 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 19 22 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 19 22 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 19 22 @@ -447,11 +448,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -470,11 +471,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 19 22 6 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 19 22 6 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 19 22 6 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 19 22 6 @@ -493,11 +494,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -516,11 +517,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -539,11 +540,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 19 22 12 14 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 19 22 12 14 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 19 22 12 14 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 19 22 12 14 @@ -552,21 +553,21 @@ BICOMP - 63 + 60 ICCARM - 115 59 + 115 63 BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -585,11 +586,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -598,21 +599,21 @@ BICOMP - 64 + 59 ICCARM - 121 62 + 121 58 BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 42 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 42 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 42 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 42 @@ -631,11 +632,11 @@ BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -648,17 +649,17 @@ ICCARM - 67 58 + 67 64 BICOMP - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 ICCARM - 47 40 43 24 52 33 51 37 35 39 45 134 49 54 + 47 40 43 135 52 33 51 37 35 39 45 134 49 54 @@ -667,7 +668,7 @@ BILINK - 60 63 100 64 65 93 86 92 84 87 116 88 101 94 89 102 95 90 103 66 + 62 60 100 59 65 93 85 92 84 87 116 88 101 94 89 102 95 90 103 66 @@ -682,7 +683,7 @@ ILINK - 85 112 59 57 62 61 70 78 97 71 79 80 117 81 56 69 82 99 91 83 98 58 55 123 108 122 + 86 112 63 57 58 61 70 78 97 71 79 80 117 81 56 69 82 99 91 83 98 64 55 123 108 122 @@ -701,7 +702,7 @@ ILINK - 85 112 59 57 125 126 62 61 70 78 97 71 79 80 117 81 56 69 82 99 91 83 98 58 55 123 108 122 + 86 112 63 57 125 126 58 61 70 78 97 71 79 80 117 81 56 69 82 99 91 83 98 64 55 123 108 122 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.ewp b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.ewp index 0ca06cfb..04f48469 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.ewp +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/lm3s8962.ewp @@ -1925,7 +1925,7 @@ - $PROJ_DIR$\..\config.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\hooks.c diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/settings/lm3s8962.wsdt b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/settings/lm3s8962.wsdt index f078beed..0c35ee6b 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/settings/lm3s8962.wsdt +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Boot/ide/settings/lm3s8962.wsdt @@ -25,7 +25,7 @@ - + TabID-17931-22022 @@ -37,7 +37,7 @@ - 0 + 0 TabID-24560-22511 @@ -47,20 +47,20 @@ - 0 + 0 - TextEditor$WS_DIR$\..\main.c0000048291329130TextEditor$WS_DIR$\..\config.h0000060908908TextEditor$WS_DIR$\..\..\..\..\Source\com.c0000013170017001TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\timer.c000008852605260TextEditor$WS_DIR$\..\..\..\..\Source\xcp.c000002131148111481TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\uart.c0000010053825382TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\flash.c000008252115231TextEditor$WS_DIR$\..\..\..\..\Source\plausibility.h0000017363006300TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\cpu.c0000024227022700100000010000001 + TextEditor$WS_DIR$\..\main.c0000048291329130TextEditor$WS_DIR$\..\..\..\..\Source\com.c0000013170017001TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\timer.c000008852605260TextEditor$WS_DIR$\..\..\..\..\Source\xcp.c000002131148111481TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\uart.c0000010053825382TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\flash.c000008252115231TextEditor$WS_DIR$\..\..\..\..\Source\plausibility.h0000017363006300TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\cpu.c0000024227022700100000010000001 - iaridepm.enu1-2-2393225-2-2126138125000240418225198688153-2-21361010-2-210121381003968240418125000240418 + iaridepm.enu1-2-2642225-2-212613897372167679175425782503-2-21361296-2-21298138100309116767997372167679 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/bin/demoprog_ek_lm3s8962.out b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/bin/demoprog_ek_lm3s8962.out index bcdd993b..012a16fe 100644 Binary files a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/bin/demoprog_ek_lm3s8962.out and b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/bin/demoprog_ek_lm3s8962.out differ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/header.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/header.h index 35e7b89a..b5df2bf1 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/header.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "boot.h" /* bootloader interface driver */ #include "irq.h" /* IRQ driver */ #include "led.h" /* LED driver */ diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/lm3s8962.dep b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/lm3s8962.dep index cc00a0dc..24301b92 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/lm3s8962.dep +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/lm3s8962.dep @@ -88,16 +88,15 @@ $PROJ_DIR$\..\time.c $PROJ_DIR$\..\time.h $PROJ_DIR$\..\vectors.c - $PROJ_DIR$\..\obj\lm3s8962.pbd $PROJ_DIR$\..\bin\demoprog_ek_lm3s6965.out + $PROJ_DIR$\..\obj\lm3s8962.pbd $PROJ_DIR$\..\obj\hibernate.lst - $PROJ_DIR$\..\obj\vectors.pbi - $PROJ_DIR$\..\obj\led.lst - $PROJ_DIR$\..\..\Boot\config.h $PROJ_DIR$\..\obj\main.pbi - $PROJ_DIR$\..\obj\vectors.lst $PROJ_DIR$\..\obj\main.lst + $PROJ_DIR$\..\obj\vectors.lst $PROJ_DIR$\..\obj\boot.lst + $PROJ_DIR$\..\obj\led.lst + $PROJ_DIR$\..\obj\vectors.pbi $PROJ_DIR$\..\obj\timer.pbi $PROJ_DIR$\..\obj\timer.lst $PROJ_DIR$\..\obj\irq.lst @@ -185,12 +184,12 @@ $PROJ_DIR$\..\obj\pwm.lst $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c @@ -267,17 +266,18 @@ $PROJ_DIR$\..\obj\can.pbi $PROJ_DIR$\..\obj\can.o $PROJ_DIR$\..\obj\can.lst + $PROJ_DIR$\..\..\Boot\blt_conf.h $PROJ_DIR$\..\lib\driverlib\comp.c BICOMP - 131 + 130 ICCARM - 252 111 + 251 110 @@ -296,11 +296,11 @@ BICOMP - 130 + 129 ICCARM - 253 110 + 252 109 @@ -319,11 +319,11 @@ BICOMP - 258 + 257 ICCARM - 260 259 + 259 258 @@ -342,11 +342,11 @@ BICOMP - 132 + 131 ICCARM - 251 173 + 250 172 @@ -365,11 +365,11 @@ BICOMP - 133 + 132 ICCARM - 254 174 + 253 173 @@ -388,11 +388,11 @@ BICOMP - 134 + 133 ICCARM - 256 107 + 255 106 @@ -411,11 +411,11 @@ BICOMP - 135 + 134 ICCARM - 146 114 + 145 113 @@ -434,14 +434,18 @@ BICOMP - 136 + 135 ICCARM - 255 115 + 254 114 + + BICOMP + 53 57 58 63 65 8 16 24 + ICCARM 53 57 58 63 65 8 16 24 @@ -453,11 +457,11 @@ BICOMP - 137 + 136 ICCARM - 84 116 + 84 115 @@ -476,11 +480,11 @@ BICOMP - 138 + 137 ICCARM - 147 117 + 146 116 @@ -499,7 +503,7 @@ ILINK - 205 257 + 204 256 @@ -508,11 +512,11 @@ BICOMP - 139 + 138 ICCARM - 250 118 + 249 117 @@ -531,11 +535,11 @@ BICOMP - 140 + 139 ICCARM - 249 119 + 248 118 @@ -554,11 +558,11 @@ BICOMP - 141 + 140 ICCARM - 109 120 + 108 119 @@ -577,11 +581,11 @@ BICOMP - 142 + 141 ICCARM - 176 121 + 175 120 @@ -600,18 +604,14 @@ BICOMP - 143 + 142 ICCARM - 170 122 + 169 121 - - BICOMP - 57 58 61 65 8 24 30 - ICCARM 57 58 61 65 8 24 30 @@ -623,11 +623,11 @@ BICOMP - 144 + 143 ICCARM - 175 123 + 174 122 @@ -646,11 +646,11 @@ BICOMP - 207 + 206 ICCARM - 169 124 + 168 123 @@ -669,14 +669,18 @@ BICOMP - 208 + 207 ICCARM - 108 125 + 107 124 + + BICOMP + 57 59 65 8 24 36 + ICCARM 57 59 65 8 24 36 @@ -688,11 +692,11 @@ BICOMP - 92 + 91 ICCARM - 93 218 + 92 217 @@ -711,11 +715,11 @@ BICOMP - 209 + 208 ICCARM - 168 126 + 167 125 @@ -734,11 +738,11 @@ BICOMP - 210 + 209 ICCARM - 171 127 + 170 126 @@ -757,11 +761,11 @@ BICOMP - 211 + 210 ICCARM - 172 128 + 171 127 @@ -780,11 +784,11 @@ BICOMP - 212 + 211 ICCARM - 113 129 + 112 128 @@ -803,21 +807,21 @@ BICOMP - 219 + 218 ICCARM - 91 243 + 88 242 BICOMP - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 ICCARM - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 @@ -826,7 +830,7 @@ AARM - 155 + 154 @@ -835,21 +839,21 @@ BICOMP - 203 + 202 ICCARM - 94 240 + 93 239 BICOMP - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 ICCARM - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 @@ -858,21 +862,21 @@ BICOMP - 204 + 203 ICCARM - 86 242 + 89 241 BICOMP - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 ICCARM - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 @@ -881,21 +885,21 @@ BICOMP - 88 + 85 ICCARM - 90 241 + 86 240 BICOMP - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 ICCARM - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 @@ -904,21 +908,21 @@ BICOMP - 248 + 247 ICCARM - 112 247 + 111 246 BICOMP - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 ICCARM - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 @@ -927,30 +931,21 @@ BICOMP - 85 + 90 ICCARM - 89 217 + 87 216 BICOMP - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 ICCARM - 73 87 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 - - - - - $PROJ_DIR$\..\obj\lm3s8962.pbd - - - BILINK - 130 219 258 131 132 133 134 135 136 137 138 139 140 203 204 88 141 142 143 144 207 208 248 92 209 210 211 85 212 + 73 260 71 75 77 80 57 58 59 63 65 34 16 40 4 24 36 @@ -959,13 +954,13 @@ OBJCOPY - 145 + 144 ILINK - 213 110 243 111 173 155 174 107 114 115 116 117 118 119 240 242 241 120 121 122 123 124 125 247 218 126 127 128 217 129 239 159 98 158 + 212 109 242 110 172 154 173 106 113 114 115 116 117 118 239 241 240 119 120 121 122 123 124 246 217 125 126 127 216 128 238 158 97 157 @@ -974,33 +969,7 @@ BICOMP - 161 - - - ICCARM - 153 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c - - - BICOMP - 157 - - - ICCARM - 238 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c - - - BICOMP - 237 + 160 ICCARM @@ -1008,12 +977,38 @@ + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c + + + BICOMP + 156 + + + ICCARM + 237 + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c BICOMP - 162 + 161 + + + ICCARM + 150 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c + + + BICOMP + 236 ICCARM @@ -1026,20 +1021,7 @@ BICOMP - 163 - - - ICCARM - 150 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - - - BICOMP - 164 + 162 ICCARM @@ -1048,20 +1030,59 @@ - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c BICOMP - 236 + 163 ICCARM - 154 + 148 $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c + + + BICOMP + 164 + + + ICCARM + 214 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c + + + BICOMP + 235 + + + ICCARM + 153 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c + + + BICOMP + 159 + + + ICCARM + 213 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c BICOMP @@ -1074,20 +1095,7 @@ - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c - - - BICOMP - 160 - - - ICCARM - 214 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c BICOMP @@ -1095,20 +1103,7 @@ ICCARM - 216 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c - - - BICOMP - 167 - - - ICCARM - 95 + 94 @@ -1117,11 +1112,11 @@ BICOMP - 97 + 96 ICCARM - 96 + 95 @@ -1130,11 +1125,11 @@ BICOMP - 102 + 101 ICCARM - 156 + 155 @@ -1143,11 +1138,11 @@ BICOMP - 222 + 221 ICCARM - 224 + 223 @@ -1156,11 +1151,11 @@ BICOMP - 148 + 147 ICCARM - 225 + 224 @@ -1169,11 +1164,11 @@ BICOMP - 106 + 105 ICCARM - 226 + 225 @@ -1182,11 +1177,11 @@ BICOMP - 220 + 219 ICCARM - 227 + 226 @@ -1195,11 +1190,11 @@ BICOMP - 100 + 99 ICCARM - 228 + 227 @@ -1208,11 +1203,11 @@ BICOMP - 99 + 98 ICCARM - 229 + 228 @@ -1221,11 +1216,11 @@ BICOMP - 221 + 220 ICCARM - 230 + 229 @@ -1234,11 +1229,11 @@ BICOMP - 105 + 104 ICCARM - 231 + 230 @@ -1247,11 +1242,11 @@ BICOMP - 104 + 103 ICCARM - 232 + 231 @@ -1260,11 +1255,11 @@ BICOMP - 103 + 102 ICCARM - 233 + 232 @@ -1273,11 +1268,11 @@ BICOMP - 101 + 100 ICCARM - 234 + 233 @@ -1286,11 +1281,11 @@ BICOMP - 223 + 222 ICCARM - 235 + 234 @@ -1299,11 +1294,11 @@ BICOMP - 92 + 91 ICCARM - 218 + 217 @@ -1312,17 +1307,17 @@ ILINK - 257 + 256 OBJCOPY - 206 + 205 ILINK - 213 110 243 259 111 173 155 174 107 114 115 116 117 118 119 240 242 241 120 121 122 123 124 125 247 218 126 127 128 217 129 239 159 98 158 + 212 109 242 258 110 172 154 173 106 113 114 115 116 117 118 239 241 240 119 120 121 122 123 124 246 217 125 126 127 216 128 238 158 97 157 @@ -1331,7 +1326,7 @@ OBJCOPY - 245 + 244 @@ -1340,7 +1335,7 @@ BILINK - 130 219 131 132 133 134 135 136 137 138 139 140 203 204 88 141 142 143 144 207 208 248 92 209 210 211 85 212 + 129 218 130 131 132 133 134 135 136 137 138 139 202 203 85 140 141 142 143 206 207 247 91 208 209 210 90 211 diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/settings/lm3s8962.wsdt b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/settings/lm3s8962.wsdt index cdf0b495..3880cee5 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/settings/lm3s8962.wsdt +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_IAR/Prog/ide/settings/lm3s8962.wsdt @@ -12,7 +12,7 @@ - 132272727 + 191272727 @@ -24,7 +24,7 @@ - + TabID-30499-23628 @@ -36,7 +36,7 @@ - 0 + 0 TabID-20859-24014 @@ -46,7 +46,7 @@ - 0 + 0 @@ -59,7 +59,7 @@ - iaridepm.enu1-2-2393206-2-2126138125000240418206349688153-2-21361010-2-210121381003968240418125000240418 + iaridepm.enu1-2-2582265-2-2162198125193240583206337709599-2-21961296-2-212981981003091240583125193240583 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/bin/openbtl_olimex_stm32h103.elf b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/bin/openbtl_olimex_stm32h103.elf index 77586cd7..6a38ec93 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/bin/openbtl_olimex_stm32h103.elf and b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/bin/openbtl_olimex_stm32h103.elf differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/config.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/config.h rename to Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/blt_conf.h index 854df2bd..d4a3cac0 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/config.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_STM32_Olimex_STM32H103_Crossworks\Boot\config.h +* \file Demo\ARMCM3_STM32_Olimex_STM32H103_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_STM32_Olimex_STM32H103_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -168,5 +168,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzp b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzp index c94836b7..2e64aba9 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzp +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzp @@ -6,8 +6,7 @@ - - + @@ -48,6 +47,7 @@ + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzs b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzs index fdfecfd2..92f0ec23 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzs +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Boot/ide/stm32f103_crossworks.hzs @@ -40,8 +40,8 @@ - + @@ -54,7 +54,7 @@ - + - + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/header.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/header.h index f0196de4..c42b469c 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/header.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f10x.h" /* STM32 register definitions */ #include "stm32f10x_conf.h" /* STM32 peripheral drivers */ #include "irq.h" /* IRQ driver */ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/ide/stm32f103_crossworks.hzs b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/ide/stm32f103_crossworks.hzs index d693316d..c848e2b7 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/ide/stm32f103_crossworks.hzs +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_Crossworks/Prog/ide/stm32f103_crossworks.hzs @@ -51,7 +51,7 @@ - + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/bin/openbtl_olimex_stm32h103.elf b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/bin/openbtl_olimex_stm32h103.elf index a75aa2d2..24f29bf3 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/bin/openbtl_olimex_stm32h103.elf and b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/bin/openbtl_olimex_stm32h103.elf differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/config.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/config.h rename to Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/blt_conf.h index 8945208f..b695f69b 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/config.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_STM32_Olimex_STM32H103_GCC\Boot\config.h +* \file Demo\ARMCM3_STM32_Olimex_STM32H103_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_STM32_Olimex_STM32H103_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -168,5 +168,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/ide/DemoBoot.project index 2a11983c..453d6da8 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/ide/DemoBoot.project @@ -95,9 +95,9 @@ - + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/makefile b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/makefile index f3d4db1b..55e08f50 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/makefile +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_olimex_stm32h103 #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ usb_conf.h \ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Prog/header.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Prog/header.h index f2e17f0a..adcb7c39 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Prog/header.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f10x.h" /* STM32 register definitions */ #include "stm32f10x_conf.h" /* STM32 peripheral drivers */ #include "irq.h" /* IRQ driver */ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/bin/openbtl_olimex_stm32h103.out b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/bin/openbtl_olimex_stm32h103.out index 00f91cca..714b8a28 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/bin/openbtl_olimex_stm32h103.out and b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/bin/openbtl_olimex_stm32h103.out differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/config.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/config.h rename to Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/blt_conf.h index 83353ee8..0fdd4b59 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/config.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_STM32_Olimex_STM32H103_IAR\Boot\config.h +* \file Demo\ARMCM3_STM32_Olimex_STM32H103_IAR\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_STM32_Olimex_STM32H103_IAR * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -170,5 +170,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/settings/stm32f103.wsdt b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/settings/stm32f103.wsdt index fe9b384e..bc838d8b 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/settings/stm32f103.wsdt +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/settings/stm32f103.wsdt @@ -12,12 +12,12 @@ - 146272727 + 231272727 20105928270201413 - + TabID-32216-31616 @@ -29,7 +29,7 @@ - 0TabID-12497-1878BuildBuildTabID-2690-2881Debug LogDebug-Log0 + 0TabID-12497-1878BuildBuildTabID-2690-2881Debug LogDebug-Log0 @@ -42,7 +42,7 @@ - iaridepm.enu1-2-2395237-2-2137116135913202091237103691638-2-21341010-2-210121361003968236934135913202091 + iaridepm.enu1-2-2585305-2-2176166136012201701237249713244-2-21931296-2-212981951003091236938136012201701 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.dep b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.dep index e2e7919b..19d244b8 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.dep +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.dep @@ -2,7 +2,7 @@ 2 - 2484448912 + 2992521537 Debug @@ -70,13 +70,13 @@ $PROJ_DIR$\..\boot.h $PROJ_DIR$\..\cstart.s $PROJ_DIR$\..\header.h - $PROJ_DIR$\..\timer.h - $PROJ_DIR$\..\irq.c - $PROJ_DIR$\..\led.c $TOOLKIT_DIR$\inc\c\DLib_Product.h - $PROJ_DIR$\..\irq.h $PROJ_DIR$\..\timer.c + $PROJ_DIR$\..\irq.h + $PROJ_DIR$\..\led.c $PROJ_DIR$\..\led.h + $PROJ_DIR$\..\irq.c + $PROJ_DIR$\..\timer.h $PROJ_DIR$\Debug\Obj\stm32f10x_crc.pbi $PROJ_DIR$\Debug\Obj\core_cm3.o $TOOLKIT_DIR$\inc\c\yvals.h @@ -115,186 +115,6 @@ $PROJ_DIR$\..\obj\xcp.o $PROJ_DIR$\..\obj\backdoor.o $PROJ_DIR$\..\obj\assert.pbi - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_wwdg.h - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h - $PROJ_DIR$\..\boot.c - $PROJ_DIR$\..\obj\usb_core.pbi - $PROJ_DIR$\..\obj\usb_int.pbi - $PROJ_DIR$\..\obj\usb_mem.pbi - $PROJ_DIR$\..\obj\usb_regs.pbi - $PROJ_DIR$\..\obj\usb_sil.pbi - $PROJ_DIR$\..\obj\usb_sil.lst - $PROJ_DIR$\..\obj\usb_regs.lst - $PROJ_DIR$\..\bin\openbtl_olimex_stm32h103.srec - $PROJ_DIR$\..\bin\openbtl_olimex_stm32h103.out - $PROJ_DIR$\..\obj\usb_pwr.lst - $PROJ_DIR$\..\obj\usb_int.lst - $PROJ_DIR$\..\obj\usb_endp.lst - $PROJ_DIR$\..\obj\usb_core.lst - $PROJ_DIR$\Debug\Obj\app.o - $PROJ_DIR$\..\obj\stm32f10x_adc.pbi - $PROJ_DIR$\Debug\Obj\system_stm32f10x.pbi - $PROJ_DIR$\Debug\Obj\stm32f103.pbd - $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.o - $PROJ_DIR$\..\obj\stm32f10x_dac.o - $PROJ_DIR$\..\obj\stm32f10x_dma.o - $PROJ_DIR$\..\obj\vectors.o - $PROJ_DIR$\..\obj\timer.o - $PROJ_DIR$\..\obj\boot.pbi - $PROJ_DIR$\..\obj\irq.pbi - $PROJ_DIR$\..\obj\led.pbi - $PROJ_DIR$\..\obj\main.pbi - $PROJ_DIR$\..\obj\timer.pbi - $PROJ_DIR$\..\obj\vectors.pbi - $PROJ_DIR$\..\obj\boot.lst - $PROJ_DIR$\..\obj\led.lst - $PROJ_DIR$\..\obj\vectors.lst - $PROJ_DIR$\..\obj\main.lst - $PROJ_DIR$\..\obj\timer.lst - $PROJ_DIR$\..\obj\irq.lst - $PROJ_DIR$\..\obj\stm32f10x_exti.o - $PROJ_DIR$\..\obj\stm32f10x_flash.o - $PROJ_DIR$\..\obj\stm32f10x_flash.pbi - $TOOLKIT_DIR$\lib\m7M_tl.a - $PROJ_DIR$\..\obj\stm32f10x_rtc.pbi - $PROJ_DIR$\..\obj\stm32f10x_rcc.pbi - $PROJ_DIR$\..\obj\stm32f10x_wwdg.pbi - $PROJ_DIR$\..\obj\stm32f10x_fsmc.pbi - $PROJ_DIR$\..\bin\stm32f103.srec - $PROJ_DIR$\..\obj\stm32f10x_usart.pbi - $PROJ_DIR$\..\obj\stm32f10x_tim.pbi - $PROJ_DIR$\..\obj\app.pbi - $PROJ_DIR$\..\obj\stm32f103.pbd - $PROJ_DIR$\..\obj\stm32f10x_spi.pbi - $PROJ_DIR$\..\obj\stm32f10x_iwdg.pbi - $PROJ_DIR$\..\obj\stm32f10x_i2c.pbi - $PROJ_DIR$\..\obj\stm32f10x_pwr.pbi - $PROJ_DIR$\..\obj\stm32f10x_sdio.pbi - $PROJ_DIR$\..\obj\stm32f10x_gpio.pbi - $PROJ_DIR$\..\bin\stm32f103.out - $PROJ_DIR$\..\obj\os.pbi - $PROJ_DIR$\..\obj\system_stm32f10x.pbi - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_bkp.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\misc.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_adc.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_can.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_cec.h - $PROJ_DIR$\..\lib\stdperiphlib\stm32f10x_conf.h - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_crc.h - $TOOLKIT_DIR$\inc\c\intrinsics.h - $PROJ_DIR$\Debug\Obj\stm32f10x_usart.o - $PROJ_DIR$\Debug\Obj\core_cm3.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_spi.o - $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.o - $PROJ_DIR$\Debug\Obj\stm32f10x_adc.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_bkp.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_can.pbi - $PROJ_DIR$\Debug\Obj\system_stm32f10x.o - $PROJ_DIR$\..\obj\stm32f10x_gpio.o - $PROJ_DIR$\..\obj\stm32f10x_i2c.o - $PROJ_DIR$\..\obj\stm32f10x_iwdg.o - $PROJ_DIR$\..\obj\stm32f10x_pwr.o - $PROJ_DIR$\..\obj\stm32f10x_rcc.o - $PROJ_DIR$\..\obj\stm32f10x_rtc.o - $PROJ_DIR$\..\obj\hooks.lst - $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.out - $PROJ_DIR$\..\obj\assert.o - $PROJ_DIR$\..\obj\assert.lst - $PROJ_DIR$\..\obj\flash.lst - $PROJ_DIR$\..\obj\backdoor.lst - $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.srec - $PROJ_DIR$\..\..\..\..\Source\ARMCM3_STM32\IAR\memory.x - $PROJ_DIR$\..\obj\hooks.pbi - $PROJ_DIR$\..\obj\hooks.o - $PROJ_DIR$\..\obj\cpu.lst - $PROJ_DIR$\..\obj\uart.lst - $PROJ_DIR$\..\obj\can.lst - $PROJ_DIR$\..\obj\cop.lst - $PROJ_DIR$\..\obj\com.lst - $PROJ_DIR$\..\obj\stm32f10x_sdio.o - $PROJ_DIR$\..\obj\stm32f10x_spi.o - $PROJ_DIR$\..\obj\stm32f10x_tim.o - $PROJ_DIR$\..\obj\stm32f10x_usart.o - $PROJ_DIR$\..\obj\stm32f10x_wwdg.o - $PROJ_DIR$\..\obj\system_stm32f10x.o - $PROJ_DIR$\..\obj\app.o - $PROJ_DIR$\..\obj\core_cm3.pbi - $PROJ_DIR$\..\obj\misc.pbi - $PROJ_DIR$\..\obj\hw.o - $PROJ_DIR$\..\obj\os.o - $PROJ_DIR$\..\obj\stm32f10x_wwdg.lst - $PROJ_DIR$\..\obj\stm32f10x_cec.lst - $PROJ_DIR$\Debug\Obj\stm32f10x_exti.pbi - $PROJ_DIR$\..\obj\stm32f10x_bkp.lst - $PROJ_DIR$\..\obj\stm32f10x_can.lst - $PROJ_DIR$\..\obj\stm32f10x_adc.lst - $PROJ_DIR$\..\obj\stm32f10x_crc.lst - $PROJ_DIR$\..\obj\misc.lst - $PROJ_DIR$\..\obj\stm32f10x_dac.lst - $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.lst - $PROJ_DIR$\..\obj\stm32f10x_exti.lst - $PROJ_DIR$\..\obj\stm32f10x_flash.lst - $PROJ_DIR$\..\obj\stm32f10x_fsmc.lst - $PROJ_DIR$\..\obj\stm32f10x_gpio.lst - $PROJ_DIR$\..\obj\stm32f10x_i2c.lst - $PROJ_DIR$\..\obj\stm32f10x_iwdg.lst - $PROJ_DIR$\..\obj\stm32f10x_pwr.lst - $PROJ_DIR$\..\obj\stm32f10x_rcc.lst - $PROJ_DIR$\..\obj\stm32f10x_rtc.lst - $PROJ_DIR$\..\obj\stm32f10x_sdio.lst - $PROJ_DIR$\..\obj\stm32f10x_spi.lst - $PROJ_DIR$\..\obj\stm32f10x_dma.lst - $PROJ_DIR$\..\obj\stm32f10x_tim.lst - $PROJ_DIR$\..\obj\stm32f10x_usart.lst - $TOOLKIT_DIR$\inc\c\xencoding_limits.h - $PROJ_DIR$\Debug\Obj\stm32f10x_i2c.pbi - $TOOLKIT_DIR$\lib\dl7M_tln.a - $PROJ_DIR$\Debug\Obj\misc.pbi - $TOOLKIT_DIR$\inc\c\DLib_Threads.h - $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.o - $PROJ_DIR$\Debug\Obj\stm32f10x_rtc.o - $TOOLKIT_DIR$\lib\rt7M_tl.a - $PROJ_DIR$\Debug\Obj\stm32f10x_fsmc.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_gpio.o - $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.o - $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_dma.o - $PROJ_DIR$\Debug\Obj\stm32f10x_exti.o - $PROJ_DIR$\Debug\Obj\stm32f10x_flash.o - $PROJ_DIR$\Debug\Obj\stm32f10x_dac.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_dma.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_flash.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_tim.o - $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.pbi - $PROJ_DIR$\..\obj\stm32f10x_bkp.pbi - $PROJ_DIR$\..\obj\stm32f10x_can.pbi - $PROJ_DIR$\..\obj\stm32f10x_cec.pbi - $PROJ_DIR$\..\obj\stm32f10x_crc.pbi - $PROJ_DIR$\..\obj\stm32f10x_dac.pbi - $PROJ_DIR$\..\obj\stm32f10x_dma.pbi - $PROJ_DIR$\..\obj\stm32f10x_exti.pbi - $PROJ_DIR$\..\obj\hw.pbi - $PROJ_DIR$\Debug\Obj\os.pbi - $PROJ_DIR$\..\..\..\..\Source\file.h - $PROJ_DIR$\..\obj\cop.o - $PROJ_DIR$\..\obj\com.o - $PROJ_DIR$\..\obj\backdoor.pbi $PROJ_DIR$\..\obj\com.pbi $PROJ_DIR$\..\obj\cop.pbi $PROJ_DIR$\..\obj\xcp.pbi @@ -394,27 +214,208 @@ $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_pwr.h $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_spi.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_wwdg.h + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h + $PROJ_DIR$\..\boot.c + $PROJ_DIR$\..\obj\usb_core.pbi + $PROJ_DIR$\..\obj\usb_int.pbi + $PROJ_DIR$\..\obj\usb_mem.pbi + $PROJ_DIR$\..\obj\usb_regs.pbi + $PROJ_DIR$\..\obj\usb_sil.pbi + $PROJ_DIR$\..\obj\usb_sil.lst + $PROJ_DIR$\..\obj\usb_regs.lst + $PROJ_DIR$\..\bin\openbtl_olimex_stm32h103.srec + $PROJ_DIR$\..\bin\openbtl_olimex_stm32h103.out + $PROJ_DIR$\..\obj\usb_pwr.lst + $PROJ_DIR$\..\obj\usb_int.lst + $PROJ_DIR$\..\obj\usb_endp.lst + $PROJ_DIR$\..\obj\usb_core.lst + $PROJ_DIR$\Debug\Obj\app.o + $PROJ_DIR$\..\obj\stm32f10x_adc.pbi + $PROJ_DIR$\Debug\Obj\system_stm32f10x.pbi + $PROJ_DIR$\Debug\Obj\stm32f103.pbd + $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.o + $PROJ_DIR$\..\obj\stm32f10x_dac.o + $PROJ_DIR$\..\obj\stm32f10x_dma.o + $PROJ_DIR$\..\obj\vectors.o + $PROJ_DIR$\..\obj\timer.o + $PROJ_DIR$\..\obj\boot.pbi + $PROJ_DIR$\..\obj\irq.pbi + $PROJ_DIR$\..\obj\led.pbi + $PROJ_DIR$\..\obj\main.pbi + $PROJ_DIR$\..\obj\timer.pbi + $PROJ_DIR$\..\obj\vectors.pbi + $PROJ_DIR$\..\obj\boot.lst + $PROJ_DIR$\..\obj\led.lst + $PROJ_DIR$\..\obj\vectors.lst + $PROJ_DIR$\..\obj\main.lst + $PROJ_DIR$\..\obj\timer.lst + $PROJ_DIR$\..\obj\irq.lst + $PROJ_DIR$\..\obj\stm32f10x_exti.o + $PROJ_DIR$\..\obj\stm32f10x_flash.o + $PROJ_DIR$\..\obj\stm32f10x_flash.pbi + $TOOLKIT_DIR$\lib\m7M_tl.a + $PROJ_DIR$\..\obj\stm32f10x_rtc.pbi + $PROJ_DIR$\..\obj\stm32f10x_rcc.pbi + $PROJ_DIR$\..\obj\stm32f10x_wwdg.pbi + $PROJ_DIR$\..\obj\stm32f10x_fsmc.pbi + $PROJ_DIR$\..\bin\stm32f103.srec + $PROJ_DIR$\..\obj\stm32f10x_usart.pbi + $PROJ_DIR$\..\obj\stm32f10x_tim.pbi + $PROJ_DIR$\..\obj\app.pbi + $PROJ_DIR$\..\obj\stm32f103.pbd + $PROJ_DIR$\..\obj\stm32f10x_spi.pbi + $PROJ_DIR$\..\obj\stm32f10x_iwdg.pbi + $PROJ_DIR$\..\obj\stm32f10x_i2c.pbi + $PROJ_DIR$\..\obj\stm32f10x_pwr.pbi + $PROJ_DIR$\..\obj\stm32f10x_sdio.pbi + $PROJ_DIR$\..\obj\stm32f10x_gpio.pbi + $PROJ_DIR$\..\bin\stm32f103.out + $PROJ_DIR$\..\obj\os.pbi + $PROJ_DIR$\..\obj\system_stm32f10x.pbi + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_bkp.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\misc.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_adc.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_can.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_cec.h + $PROJ_DIR$\..\lib\stdperiphlib\stm32f10x_conf.h + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_crc.h + $TOOLKIT_DIR$\inc\c\intrinsics.h + $PROJ_DIR$\Debug\Obj\stm32f10x_usart.o + $PROJ_DIR$\Debug\Obj\core_cm3.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_spi.o + $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.o + $PROJ_DIR$\Debug\Obj\stm32f10x_adc.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_bkp.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_can.pbi + $PROJ_DIR$\Debug\Obj\system_stm32f10x.o + $PROJ_DIR$\..\obj\stm32f10x_gpio.o + $PROJ_DIR$\..\obj\stm32f10x_i2c.o + $PROJ_DIR$\..\obj\stm32f10x_iwdg.o + $PROJ_DIR$\..\obj\stm32f10x_pwr.o + $PROJ_DIR$\..\obj\stm32f10x_rcc.o + $PROJ_DIR$\..\obj\stm32f10x_rtc.o + $PROJ_DIR$\..\obj\hooks.lst + $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.out + $PROJ_DIR$\..\obj\assert.o + $PROJ_DIR$\..\obj\assert.lst + $PROJ_DIR$\..\obj\flash.lst + $PROJ_DIR$\..\obj\backdoor.lst + $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.srec + $PROJ_DIR$\..\obj\hooks.pbi + $PROJ_DIR$\..\..\..\..\Source\ARMCM3_STM32\IAR\memory.x + $PROJ_DIR$\..\obj\hooks.o + $PROJ_DIR$\..\obj\cpu.lst + $PROJ_DIR$\..\obj\uart.lst + $PROJ_DIR$\..\obj\can.lst + $PROJ_DIR$\..\obj\cop.lst + $PROJ_DIR$\..\obj\com.lst + $PROJ_DIR$\..\obj\stm32f10x_sdio.o + $PROJ_DIR$\..\obj\stm32f10x_spi.o + $PROJ_DIR$\..\obj\stm32f10x_tim.o + $PROJ_DIR$\..\obj\stm32f10x_usart.o + $PROJ_DIR$\..\obj\stm32f10x_wwdg.o + $PROJ_DIR$\..\obj\system_stm32f10x.o + $PROJ_DIR$\..\obj\app.o + $PROJ_DIR$\..\obj\core_cm3.pbi + $PROJ_DIR$\..\obj\misc.pbi + $PROJ_DIR$\..\obj\hw.o + $PROJ_DIR$\..\obj\os.o + $PROJ_DIR$\..\obj\stm32f10x_wwdg.lst + $PROJ_DIR$\..\obj\stm32f10x_cec.lst + $PROJ_DIR$\Debug\Obj\stm32f10x_exti.pbi + $PROJ_DIR$\..\obj\stm32f10x_bkp.lst + $PROJ_DIR$\..\obj\stm32f10x_can.lst + $PROJ_DIR$\..\obj\stm32f10x_adc.lst + $PROJ_DIR$\..\obj\stm32f10x_crc.lst + $PROJ_DIR$\..\obj\misc.lst + $PROJ_DIR$\..\obj\stm32f10x_dac.lst + $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.lst + $PROJ_DIR$\..\obj\stm32f10x_exti.lst + $PROJ_DIR$\..\obj\stm32f10x_flash.lst + $PROJ_DIR$\..\obj\stm32f10x_fsmc.lst + $PROJ_DIR$\..\obj\stm32f10x_gpio.lst + $PROJ_DIR$\..\obj\stm32f10x_i2c.lst + $PROJ_DIR$\..\obj\stm32f10x_iwdg.lst + $PROJ_DIR$\..\obj\stm32f10x_pwr.lst + $PROJ_DIR$\..\obj\stm32f10x_rcc.lst + $PROJ_DIR$\..\obj\stm32f10x_rtc.lst + $PROJ_DIR$\..\obj\stm32f10x_sdio.lst + $PROJ_DIR$\..\obj\stm32f10x_spi.lst + $PROJ_DIR$\..\obj\stm32f10x_dma.lst + $PROJ_DIR$\..\obj\stm32f10x_tim.lst + $PROJ_DIR$\..\obj\stm32f10x_usart.lst + $TOOLKIT_DIR$\inc\c\xencoding_limits.h + $PROJ_DIR$\Debug\Obj\stm32f10x_i2c.pbi + $TOOLKIT_DIR$\lib\dl7M_tln.a + $PROJ_DIR$\Debug\Obj\misc.pbi + $TOOLKIT_DIR$\inc\c\DLib_Threads.h + $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.o + $PROJ_DIR$\Debug\Obj\stm32f10x_rtc.o + $TOOLKIT_DIR$\lib\rt7M_tl.a + $PROJ_DIR$\Debug\Obj\stm32f10x_fsmc.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_gpio.o + $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.o + $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_dma.o + $PROJ_DIR$\Debug\Obj\stm32f10x_exti.o + $PROJ_DIR$\Debug\Obj\stm32f10x_flash.o + $PROJ_DIR$\Debug\Obj\stm32f10x_dac.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_dma.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_flash.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_tim.o + $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.pbi + $PROJ_DIR$\..\obj\stm32f10x_bkp.pbi + $PROJ_DIR$\..\obj\stm32f10x_can.pbi + $PROJ_DIR$\..\obj\stm32f10x_cec.pbi + $PROJ_DIR$\..\obj\stm32f10x_crc.pbi + $PROJ_DIR$\..\obj\stm32f10x_dac.pbi + $PROJ_DIR$\..\obj\stm32f10x_dma.pbi + $PROJ_DIR$\..\obj\stm32f10x_exti.pbi + $PROJ_DIR$\..\obj\hw.pbi + $PROJ_DIR$\Debug\Obj\os.pbi + $PROJ_DIR$\..\..\..\..\Source\file.h + $PROJ_DIR$\..\obj\cop.o + $PROJ_DIR$\..\obj\com.o + $PROJ_DIR$\..\obj\backdoor.pbi + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\lib\USB_FS_DEVICE\src\usb_core.c BICOMP - 118 + 217 ICCARM - 130 317 + 229 137 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 @@ -423,21 +424,21 @@ BICOMP - 323 + 143 ICCARM - 373 318 + 193 138 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 @@ -446,21 +447,17 @@ BICOMP - 119 + 218 ICCARM - 128 319 + 227 139 - - BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 - ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 @@ -469,17 +466,17 @@ BICOMP - 120 + 219 ICCARM - 371 320 + 191 140 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 @@ -488,21 +485,21 @@ BICOMP - 121 + 220 ICCARM - 124 321 + 223 141 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 @@ -511,21 +508,21 @@ BICOMP - 122 + 221 ICCARM - 123 322 + 222 142 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 @@ -534,21 +531,21 @@ BICOMP - 227 + 326 ICCARM - 84 343 + 84 163 BICOMP - 86 88 73 332 90 67 255 259 + 86 88 73 152 90 64 354 358 ICCARM - 86 88 73 332 90 67 255 259 + 86 88 73 152 90 64 354 358 @@ -557,21 +554,21 @@ BICOMP - 173 + 272 ICCARM - 81 225 + 81 324 BICOMP - 17 16 86 88 73 332 90 67 255 259 190 19 + 17 16 86 88 73 152 90 64 354 358 289 19 ICCARM - 17 16 86 88 73 332 90 67 255 259 190 19 + 17 16 86 88 73 152 90 64 354 358 289 19 @@ -580,7 +577,7 @@ ILINK - 126 374 + 225 194 @@ -589,21 +586,21 @@ BICOMP - 213 + 311 ICCARM - 205 214 + 304 313 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 17 16 86 88 73 332 90 67 255 259 190 19 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 17 16 86 88 73 152 90 64 354 358 289 19 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 17 16 86 88 73 332 90 67 255 259 190 19 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 17 16 86 88 73 152 90 64 354 358 289 19 @@ -612,21 +609,21 @@ BICOMP - 143 + 242 ICCARM - 149 101 + 248 101 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 17 16 86 88 73 332 90 67 255 259 190 19 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 17 16 86 88 73 152 90 64 354 358 289 19 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 17 16 86 88 73 332 90 67 255 259 190 19 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 17 16 86 88 73 152 90 64 354 358 289 19 @@ -635,21 +632,21 @@ BICOMP - 307 + 127 ICCARM - 372 310 + 192 130 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 25 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 25 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 25 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 25 @@ -658,21 +655,21 @@ BICOMP - 316 + 136 ICCARM - 129 315 + 228 135 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 25 28 32 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 25 28 32 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 25 28 32 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 25 28 32 @@ -681,21 +678,21 @@ BICOMP - 314 + 134 ICCARM - 370 312 + 190 132 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 30 32 28 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 30 32 28 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 30 32 28 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 30 32 28 @@ -704,21 +701,21 @@ BICOMP - 311 + 131 ICCARM - 375 313 + 195 133 BICOMP - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 30 25 32 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 30 25 32 ICCARM - 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 30 25 32 + 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 30 25 32 @@ -727,21 +724,21 @@ BICOMP - 309 + 129 ICCARM - 127 308 + 226 128 BICOMP - 17 16 86 88 73 332 90 67 255 259 190 19 7 14 23 11 3 0 1 9 6 13 32 45 + 17 16 86 88 73 152 90 64 354 358 289 19 7 14 23 11 3 0 1 9 6 13 32 45 ICCARM - 17 16 86 88 73 332 90 67 255 259 190 19 7 14 23 11 3 0 1 9 6 13 32 45 + 17 16 86 88 73 152 90 64 354 358 289 19 7 14 23 11 3 0 1 9 6 13 32 45 @@ -754,17 +751,17 @@ ICCARM - 208 207 + 307 306 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -773,7 +770,7 @@ AARM - 352 + 172 @@ -782,21 +779,21 @@ BICOMP - 145 + 244 ICCARM - 148 138 + 247 237 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -805,21 +802,21 @@ BICOMP - 300 + 120 ICCARM - 217 296 + 316 116 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -828,21 +825,21 @@ BICOMP - 303 + 123 ICCARM - 215 298 + 314 118 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -851,21 +848,21 @@ BICOMP - 302 + 122 ICCARM - 209 299 + 308 119 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -874,21 +871,21 @@ BICOMP - 304 + 124 ICCARM - 293 295 + 113 115 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -897,21 +894,21 @@ BICOMP - 144 + 243 ICCARM - 150 139 + 249 238 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -920,21 +917,21 @@ BICOMP - 305 + 125 ICCARM - 216 301 + 315 121 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -943,21 +940,21 @@ BICOMP - 306 + 126 ICCARM - 294 297 + 114 117 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 25 32 28 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 25 32 28 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 7 17 16 86 88 73 332 90 67 255 259 190 19 14 23 11 3 0 1 9 6 13 25 32 28 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 7 17 16 86 88 73 152 90 64 354 358 289 19 14 23 11 3 0 1 9 6 13 25 32 28 @@ -966,21 +963,21 @@ BICOMP - 288 + 387 ICCARM - 210 107 + 309 107 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -989,21 +986,21 @@ BICOMP - 140 + 239 ICCARM - 146 103 + 245 103 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -1012,21 +1009,21 @@ BICOMP - 289 + 109 ICCARM - 219 287 + 318 386 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 48 + 53 45 49 20 58 38 57 42 40 44 51 384 55 60 48 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 48 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 48 @@ -1035,21 +1032,21 @@ BICOMP - 290 + 110 ICCARM - 218 286 + 317 385 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 20 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -1058,21 +1055,21 @@ BICOMP - 291 + 111 ICCARM - 292 106 + 112 106 BICOMP - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 20 58 38 57 42 40 44 51 384 55 60 ICCARM - 53 45 49 20 58 38 57 42 40 44 51 285 55 60 + 53 45 49 388 58 38 57 42 40 44 51 384 55 60 @@ -1081,26 +1078,26 @@ AARM - 352 + 172 - $PROJ_DIR$\..\irq.c + $PROJ_DIR$\..\timer.c BICOMP - 141 + 243 ICCARM - 151 100 + 249 238 ICCARM - 63 20 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 61 68 70 64 + 63 20 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 61 66 68 70 @@ -1109,36 +1106,36 @@ BICOMP - 142 + 241 ICCARM - 147 102 + 246 102 ICCARM - 63 20 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 61 68 70 64 + 63 20 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 61 66 68 70 - $PROJ_DIR$\..\timer.c + $PROJ_DIR$\..\irq.c BICOMP - 144 + 240 ICCARM - 150 139 + 250 100 ICCARM - 63 20 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 61 68 70 64 + 63 20 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 61 66 68 70 @@ -1147,7 +1144,7 @@ ILINK - 87 131 72 342 350 335 351 346 76 77 79 345 265 267 268 269 329 264 80 349 96 260 261 97 193 274 191 194 198 99 262 155 257 + 87 230 72 162 170 155 171 166 76 77 79 165 364 366 367 368 149 363 80 169 96 359 360 97 292 373 290 293 297 99 361 254 356 @@ -1162,293 +1159,7 @@ ILINK - 87 103 343 352 100 102 101 340 98 341 338 337 336 136 135 137 152 153 353 199 200 201 202 203 204 220 221 222 223 224 225 139 138 99 262 155 257 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c - - - BICOMP - 162 - - - ICCARM - 253 222 - - - - - ICCARM - 110 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 112 114 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - - - BICOMP - 161 - - - ICCARM - 254 223 - - - - - ICCARM - 112 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 114 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c - - - BICOMP - 158 - - - ICCARM - 231 224 - - - - - ICCARM - 114 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c - - - BICOMP - 173 - - - ICCARM - 81 225 - - - - - ICCARM - 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 - - - - - $PROJ_DIR$\..\boot.c - - - BICOMP - 140 - - - ICCARM - 146 103 - - - - - ICCARM - 63 20 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 61 68 70 64 - - - - - $PROJ_DIR$\..\bin\openbtl_olimex_stm32h103.out - - - ILINK - 374 - - - OBJCOPY - 125 - - - - - ILINK - 212 207 107 103 296 287 286 343 298 352 299 214 101 295 225 139 301 297 317 310 315 318 319 312 320 313 308 321 322 138 106 99 262 155 257 - - - - - $PROJ_DIR$\Debug\Obj\stm32f103.pbd - - - BILINK - 348 192 347 258 284 195 196 197 94 71 270 271 272 233 273 263 339 256 92 95 93 74 91 89 85 75 266 133 - - - - - $PROJ_DIR$\..\bin\stm32f103.out - - - OBJCOPY - 160 - - - - - ILINK - 87 103 343 352 100 102 101 340 98 341 338 337 336 136 135 137 152 153 353 199 200 201 202 203 204 220 221 222 223 224 225 139 138 99 262 155 257 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c - - - BICOMP - 228 - - - ICCARM - 238 340 - - - - - ICCARM - 182 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c - - - BICOMP - 276 - - - ICCARM - 234 341 - - - - - ICCARM - 176 175 178 86 88 73 332 90 67 255 259 190 116 187 183 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c - - - BICOMP - 132 - - - ICCARM - 236 98 - - - - - ICCARM - 183 175 178 86 88 73 332 90 67 255 259 190 116 187 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c - - - BICOMP - 227 - - - ICCARM - 84 343 - - - - - ICCARM - 86 88 73 332 90 67 255 259 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c - - - BICOMP - 277 - - - ICCARM - 235 338 - - - - - ICCARM - 184 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c - - - BICOMP - 278 - - - ICCARM - 232 337 - - - - - ICCARM - 186 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - - - BICOMP - 279 - - - ICCARM - 237 336 - - - - - ICCARM - 189 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 - - - - - $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.out - - - OBJCOPY - 211 - - - - - ILINK - 212 207 107 103 296 287 286 343 298 352 299 214 101 295 225 139 301 297 138 106 99 262 155 257 + 87 103 163 172 100 102 101 160 98 161 158 157 156 235 234 236 251 252 173 298 299 300 301 302 303 319 320 321 322 323 324 238 237 99 361 254 356 @@ -1457,17 +1168,17 @@ BICOMP - 145 + 244 ICCARM - 148 138 + 247 237 ICCARM - 63 20 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 61 68 70 64 + 63 20 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 61 66 68 70 @@ -1476,17 +1187,17 @@ BICOMP - 163 + 262 ICCARM - 344 226 + 164 325 ICCARM - 330 328 333 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 326 + 150 148 153 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 146 @@ -1495,7 +1206,7 @@ AARM - 352 + 172 @@ -1504,17 +1215,17 @@ BICOMP - 172 + 271 ICCARM - 82 230 + 82 329 ICCARM - 328 + 148 @@ -1523,17 +1234,17 @@ BICOMP - 283 + 382 ICCARM - 83 229 + 83 328 ICCARM - 330 328 333 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 326 + 150 148 153 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 146 @@ -1542,17 +1253,17 @@ BICOMP - 280 + 379 ICCARM - 239 136 + 338 235 ICCARM - 354 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 363 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 + 174 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 @@ -1561,17 +1272,17 @@ BICOMP - 275 + 374 ICCARM - 240 135 + 339 234 ICCARM - 363 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 360 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 + 183 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 @@ -1580,17 +1291,17 @@ BICOMP - 282 + 381 ICCARM - 241 152 + 340 251 ICCARM - 359 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 361 365 367 369 377 385 382 381 383 387 110 112 114 182 + 179 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 181 185 187 189 197 205 202 201 203 207 209 211 213 281 @@ -1599,17 +1310,17 @@ BICOMP - 154 + 253 ICCARM - 242 153 + 341 252 ICCARM - 361 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 365 367 369 377 385 382 381 383 387 110 112 114 182 + 181 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 185 187 189 197 205 202 201 203 207 209 211 213 281 @@ -1618,17 +1329,17 @@ BICOMP - 281 + 380 ICCARM - 252 137 + 351 236 ICCARM - 360 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 359 361 365 367 369 377 385 382 381 383 387 110 112 114 182 + 180 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 @@ -1637,17 +1348,17 @@ BICOMP - 159 + 258 ICCARM - 243 353 + 342 173 ICCARM - 365 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 367 369 377 385 382 381 383 387 110 112 114 182 + 185 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 187 189 197 205 202 201 203 207 209 211 213 281 @@ -1656,17 +1367,17 @@ BICOMP - 170 + 269 ICCARM - 244 199 + 343 298 ICCARM - 367 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 369 377 385 382 381 383 387 110 112 114 182 + 187 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 189 197 205 202 201 203 207 209 211 213 281 @@ -1675,17 +1386,17 @@ BICOMP - 167 + 266 ICCARM - 245 200 + 344 299 ICCARM - 369 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 377 385 382 381 383 387 110 112 114 182 + 189 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 197 205 202 201 203 207 209 211 213 281 @@ -1694,17 +1405,17 @@ BICOMP - 166 + 265 ICCARM - 246 201 + 345 300 ICCARM - 377 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 385 382 381 383 387 110 112 114 182 + 197 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 205 202 201 203 207 209 211 213 281 @@ -1713,17 +1424,17 @@ BICOMP - 168 + 267 ICCARM - 247 202 + 346 301 ICCARM - 385 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 382 381 383 387 110 112 114 182 + 205 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 202 201 203 207 209 211 213 281 @@ -1732,17 +1443,17 @@ BICOMP - 156 + 255 ICCARM - 249 204 + 348 303 ICCARM - 381 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 383 387 110 112 114 182 + 201 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 203 207 209 211 213 281 @@ -1751,17 +1462,17 @@ BICOMP - 169 + 268 ICCARM - 250 220 + 349 319 ICCARM - 383 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 387 110 112 114 182 + 203 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 207 209 211 213 281 @@ -1770,17 +1481,17 @@ BICOMP - 157 + 256 ICCARM - 248 203 + 347 302 ICCARM - 382 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 381 383 387 110 112 114 182 + 202 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 201 203 207 209 211 213 281 @@ -1789,17 +1500,303 @@ BICOMP - 165 + 264 ICCARM - 251 221 + 350 320 ICCARM - 387 175 178 86 88 73 332 90 67 255 259 190 116 187 183 176 184 186 189 354 363 360 359 361 365 367 369 377 385 382 381 383 110 112 114 182 + 207 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 209 211 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c + + + BICOMP + 261 + + + ICCARM + 352 321 + + + + + ICCARM + 209 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 211 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + + + BICOMP + 260 + + + ICCARM + 353 322 + + + + + ICCARM + 211 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c + + + BICOMP + 257 + + + ICCARM + 330 323 + + + + + ICCARM + 213 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c + + + BICOMP + 272 + + + ICCARM + 81 324 + + + + + ICCARM + 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 + + + + + $PROJ_DIR$\..\boot.c + + + BICOMP + 239 + + + ICCARM + 245 103 + + + + + ICCARM + 63 20 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 61 66 68 70 + + + + + $PROJ_DIR$\..\bin\openbtl_olimex_stm32h103.out + + + ILINK + 194 + + + OBJCOPY + 224 + + + + + ILINK + 312 306 107 103 116 386 385 163 118 172 119 313 101 115 324 238 121 117 137 130 135 138 139 132 140 133 128 141 142 237 106 99 361 254 356 + + + + + $PROJ_DIR$\Debug\Obj\stm32f103.pbd + + + BILINK + 168 291 167 357 383 294 295 296 94 71 369 370 371 332 372 362 159 355 92 95 93 74 91 89 85 75 365 232 + + + + + $PROJ_DIR$\..\bin\stm32f103.out + + + OBJCOPY + 259 + + + + + ILINK + 87 103 163 172 100 102 101 160 98 161 158 157 156 235 234 236 251 252 173 298 299 300 301 302 303 319 320 321 322 323 324 238 237 99 361 254 356 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\misc.c + + + BICOMP + 327 + + + ICCARM + 337 160 + + + + + ICCARM + 281 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c + + + BICOMP + 375 + + + ICCARM + 333 161 + + + + + ICCARM + 275 274 278 86 88 73 152 90 64 354 358 289 215 286 282 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c + + + BICOMP + 231 + + + ICCARM + 335 98 + + + + + ICCARM + 282 274 278 86 88 73 152 90 64 354 358 289 215 286 275 283 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c + + + BICOMP + 376 + + + ICCARM + 334 158 + + + + + ICCARM + 283 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 285 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c + + + BICOMP + 326 + + + ICCARM + 84 163 + + + + + ICCARM + 86 88 73 152 90 64 354 358 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c + + + BICOMP + 377 + + + ICCARM + 331 157 + + + + + ICCARM + 285 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 288 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c + + + BICOMP + 378 + + + ICCARM + 336 156 + + + + + ICCARM + 288 274 278 86 88 73 152 90 64 354 358 289 215 286 282 275 283 285 174 183 180 179 181 185 187 189 197 205 202 201 203 207 209 211 213 281 + + + + + $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.out + + + OBJCOPY + 310 + + + + + ILINK + 312 306 107 103 116 386 385 163 118 172 119 313 101 115 324 238 121 117 237 106 99 361 254 356 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.ewp b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.ewp index 297c3633..98a78d57 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.ewp +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Boot/ide/stm32f103.ewp @@ -1909,7 +1909,7 @@ - $PROJ_DIR$\..\config.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\hooks.c diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/bin/demoprog_olimex_stm32h103.out b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/bin/demoprog_olimex_stm32h103.out index 6e7eb540..3a354acf 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/bin/demoprog_olimex_stm32h103.out and b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/bin/demoprog_olimex_stm32h103.out differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/header.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/header.h index 43bda3fa..2dcabd13 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/header.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f10x.h" /* STM32 register definitions */ #include "stm32f10x_conf.h" /* STM32 peripheral drivers */ #include "irq.h" /* IRQ driver */ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/settings/stm32f103.wsdt b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/settings/stm32f103.wsdt index 53fe04a3..e1e7e552 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/settings/stm32f103.wsdt +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/settings/stm32f103.wsdt @@ -12,12 +12,12 @@ - 163272727 + 231272727 20105928270201413 - + TabID-32216-31616 @@ -29,7 +29,7 @@ - 0TabID-12497-1878BuildBuildTabID-2690-2881Debug LogDebug-Log0 + 0TabID-12497-1878BuildBuildTabID-2690-2881Debug LogDebug-Log0 @@ -42,7 +42,7 @@ - iaridepm.enu1-2-2395237-2-2137116135913202091237103691638-2-21341010-2-210121361003968236934135913202091 + iaridepm.enu1-2-2585305-2-2176166136012201701237249713244-2-21931296-2-212981951003091236938136012201701 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/stm32f103.dep b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/stm32f103.dep index 86cb41e8..ea4390ea 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/stm32f103.dep +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32H103_IAR/Prog/ide/stm32f103.dep @@ -71,13 +71,13 @@ $PROJ_DIR$\Debug\Obj\os.o $PROJ_DIR$\..\obj\stm32f10x_crc.o $PROJ_DIR$\..\obj\stm32f10x_cec.o - $PROJ_DIR$\..\obj\misc.o - $PROJ_DIR$\Debug\Obj\stm32f10x_gpio.pbi - $PROJ_DIR$\..\obj\app.lst $PROJ_DIR$\Debug\Obj\hw.o - $PROJ_DIR$\..\obj\stm32f10x_can.o $PROJ_DIR$\..\obj\core_cm3.o + $PROJ_DIR$\..\obj\stm32f10x_can.o + $PROJ_DIR$\..\obj\app.lst $PROJ_DIR$\..\obj\stm32f10x_bkp.o + $PROJ_DIR$\Debug\Obj\stm32f10x_gpio.pbi + $PROJ_DIR$\..\obj\misc.o $PROJ_DIR$\Debug\Obj\stm32f10x_dac.o $PROJ_DIR$\Debug\Obj\stm32f10x_bkp.o $PROJ_DIR$\Debug\Obj\hw.pbi @@ -262,6 +262,7 @@ $PROJ_DIR$\..\bin\demoprog_olimex_stm32p103.srec $PROJ_DIR$\..\bin\demoprog_olimex_stm32h103.srec $PROJ_DIR$\..\bin\demoprog_olimex_stm32h103.out + $PROJ_DIR$\..\..\Boot\blt_conf.h $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c @@ -272,7 +273,7 @@ ICCARM - 172 70 + 172 66 @@ -295,7 +296,7 @@ ICCARM - 231 65 + 231 71 @@ -322,6 +323,10 @@ + + BICOMP + 6 2 1 174 176 161 128 178 158 87 132 198 51 13 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 + ICCARM 6 2 1 174 176 161 128 178 158 87 132 198 51 13 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 @@ -337,14 +342,10 @@ ICCARM - 227 71 + 227 69 - - BICOMP - 8 2 1 174 176 161 128 178 158 87 132 198 51 13 6 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 - ICCARM 8 2 1 174 176 161 128 178 158 87 132 198 51 13 6 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 @@ -360,7 +361,7 @@ ICCARM - 228 69 + 228 67 @@ -867,7 +868,7 @@ ICCARM - 53 98 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 + 53 256 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 @@ -890,7 +891,7 @@ ICCARM - 53 98 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 + 53 256 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 @@ -913,7 +914,7 @@ ICCARM - 53 98 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 + 53 256 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 @@ -936,7 +937,7 @@ ICCARM - 53 98 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 + 53 256 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 @@ -959,7 +960,7 @@ ICCARM - 53 98 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 + 53 256 2 1 174 176 161 128 178 158 87 132 198 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 55 57 60 @@ -1000,7 +1001,7 @@ ICCARM - 67 219 + 68 219 @@ -1062,7 +1063,7 @@ ILINK - 175 81 160 68 77 62 78 73 164 165 167 72 138 140 141 142 125 137 168 76 244 133 134 245 201 147 199 202 206 247 135 108 89 + 175 81 160 65 77 62 78 73 164 165 167 72 138 140 141 142 125 137 168 76 244 133 134 245 201 147 199 202 206 247 135 108 89 @@ -1071,7 +1072,7 @@ BILINK - 75 200 74 90 157 203 204 205 182 159 143 144 145 226 146 136 66 88 180 183 181 162 179 177 173 163 139 184 + 75 200 74 90 157 203 204 205 182 159 143 144 145 226 146 136 70 88 180 183 181 162 179 177 173 163 139 184 @@ -1086,7 +1087,7 @@ ILINK - 175 251 70 79 248 250 249 65 246 71 69 64 63 187 186 188 105 106 80 207 208 209 210 211 212 213 214 215 216 217 218 190 189 247 135 108 89 + 175 251 66 79 248 250 249 71 246 69 67 64 63 187 186 188 105 106 80 207 208 209 210 211 212 213 214 215 216 217 218 190 189 247 135 108 89 @@ -1101,7 +1102,7 @@ ILINK - 175 251 70 79 248 250 249 65 246 71 69 64 63 187 186 188 105 106 80 207 208 209 210 211 212 213 214 215 216 217 218 190 189 247 135 108 89 + 175 251 66 79 248 250 249 71 246 69 67 64 63 187 186 188 105 106 80 207 208 209 210 211 212 213 214 215 216 217 218 190 189 247 135 108 89 @@ -1120,7 +1121,7 @@ ILINK - 175 70 79 248 250 249 65 246 71 69 64 63 187 186 188 105 106 80 207 208 209 210 211 212 213 214 215 216 217 218 190 189 247 135 108 89 + 175 66 79 248 250 249 71 246 69 67 64 63 187 186 188 105 106 80 207 208 209 210 211 212 213 214 215 216 217 218 190 189 247 135 108 89 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.elf b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.elf index e413d31b..ed88aee6 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.elf and b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.elf differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.map b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.map index 8913cef1..caf8c5b9 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.map +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/bin/openbtl_olimex_stm32p103.map @@ -1786,67 +1786,67 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossw .debug_frame 0x00003724 0xa0 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le.a(user_libc.o) .debug_frame 0x000037c4 0x600 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libm_v7m_t_le.a(libm_asm.o) -.debug_info 0x00000000 0x964e - .debug_info 0x00000000 0x640 THUMB Debug/../../obj/hooks.o - .debug_info 0x00000640 0x31f THUMB Debug/../../obj/main.o - .debug_info 0x0000095f 0x53d THUMB Debug/../../obj/core_cm3.o - .debug_info 0x00000e9c 0x4c6 THUMB Debug/../../obj/system_stm32f10x.o - .debug_info 0x00001362 0x95e THUMB Debug/../../obj/mmc.o - .debug_info 0x00001cc0 0x716 THUMB Debug/../../obj/stm32f10x_gpio.o - .debug_info 0x000023d6 0x8ef THUMB Debug/../../obj/stm32f10x_rcc.o - .debug_info 0x00002cc5 0x959 THUMB Debug/../../obj/stm32f10x_spi.o - .debug_info 0x0000361e 0xa51 THUMB Debug/../../obj/stm32f10x_usart.o - .debug_info 0x0000406f 0x10a THUMB Debug/../../obj/cstart.o - .debug_info 0x00004179 0xfc THUMB Debug/../../obj/vectors.o - .debug_info 0x00004275 0x65 THUMB Debug/../../obj/can.o - .debug_info 0x000042da 0x145 THUMB Debug/../../obj/cpu.o - .debug_info 0x0000441f 0x169 THUMB Debug/../../obj/nvm.o - .debug_info 0x00004588 0x11e THUMB Debug/../../obj/timer.o - .debug_info 0x000046a6 0x294 THUMB Debug/../../obj/uart.o - .debug_info 0x0000493a 0x67d THUMB Debug/../../obj/flash.o - .debug_info 0x00004fb7 0xef THUMB Debug/../../obj/assert.o - .debug_info 0x000050a6 0xcb THUMB Debug/../../obj/backdoor.o - .debug_info 0x00005171 0x93 THUMB Debug/../../obj/boot.o - .debug_info 0x00005204 0x1bf THUMB Debug/../../obj/com.o - .debug_info 0x000053c3 0x91 THUMB Debug/../../obj/cop.o - .debug_info 0x00005454 0x61c THUMB Debug/../../obj/xcp.o - .debug_info 0x00005a70 0x2054 THUMB Debug/../../obj/ff.o - .debug_info 0x00007ac4 0x160 THUMB Debug/../../obj/unicode.o - .debug_info 0x00007c24 0x7db THUMB Debug/../../obj/file.o - .debug_info 0x000083ff 0xc63 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le.a(libc2.o) - .debug_info 0x00009062 0x51f C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7m_t_le.a(libdebugio.o) - .debug_info 0x00009581 0xcd C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le.a(user_libc.o) +.debug_info 0x00000000 0x964f + .debug_info 0x00000000 0x641 THUMB Debug/../../obj/hooks.o + .debug_info 0x00000641 0x31f THUMB Debug/../../obj/main.o + .debug_info 0x00000960 0x53d THUMB Debug/../../obj/core_cm3.o + .debug_info 0x00000e9d 0x4c6 THUMB Debug/../../obj/system_stm32f10x.o + .debug_info 0x00001363 0x95e THUMB Debug/../../obj/mmc.o + .debug_info 0x00001cc1 0x716 THUMB Debug/../../obj/stm32f10x_gpio.o + .debug_info 0x000023d7 0x8ef THUMB Debug/../../obj/stm32f10x_rcc.o + .debug_info 0x00002cc6 0x959 THUMB Debug/../../obj/stm32f10x_spi.o + .debug_info 0x0000361f 0xa51 THUMB Debug/../../obj/stm32f10x_usart.o + .debug_info 0x00004070 0x10a THUMB Debug/../../obj/cstart.o + .debug_info 0x0000417a 0xfc THUMB Debug/../../obj/vectors.o + .debug_info 0x00004276 0x65 THUMB Debug/../../obj/can.o + .debug_info 0x000042db 0x145 THUMB Debug/../../obj/cpu.o + .debug_info 0x00004420 0x169 THUMB Debug/../../obj/nvm.o + .debug_info 0x00004589 0x11e THUMB Debug/../../obj/timer.o + .debug_info 0x000046a7 0x294 THUMB Debug/../../obj/uart.o + .debug_info 0x0000493b 0x67d THUMB Debug/../../obj/flash.o + .debug_info 0x00004fb8 0xef THUMB Debug/../../obj/assert.o + .debug_info 0x000050a7 0xcb THUMB Debug/../../obj/backdoor.o + .debug_info 0x00005172 0x93 THUMB Debug/../../obj/boot.o + .debug_info 0x00005205 0x1bf THUMB Debug/../../obj/com.o + .debug_info 0x000053c4 0x91 THUMB Debug/../../obj/cop.o + .debug_info 0x00005455 0x61c THUMB Debug/../../obj/xcp.o + .debug_info 0x00005a71 0x2054 THUMB Debug/../../obj/ff.o + .debug_info 0x00007ac5 0x160 THUMB Debug/../../obj/unicode.o + .debug_info 0x00007c25 0x7db THUMB Debug/../../obj/file.o + .debug_info 0x00008400 0xc63 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le.a(libc2.o) + .debug_info 0x00009063 0x51f C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7m_t_le.a(libdebugio.o) + .debug_info 0x00009582 0xcd C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le.a(user_libc.o) -.debug_abbrev 0x00000000 0x1f43 - .debug_abbrev 0x00000000 0x19f THUMB Debug/../../obj/hooks.o - .debug_abbrev 0x0000019f 0x109 THUMB Debug/../../obj/main.o - .debug_abbrev 0x000002a8 0xa9 THUMB Debug/../../obj/core_cm3.o - .debug_abbrev 0x00000351 0x1a8 THUMB Debug/../../obj/system_stm32f10x.o - .debug_abbrev 0x000004f9 0x2de THUMB Debug/../../obj/mmc.o - .debug_abbrev 0x000007d7 0x1db THUMB Debug/../../obj/stm32f10x_gpio.o - .debug_abbrev 0x000009b2 0x1d2 THUMB Debug/../../obj/stm32f10x_rcc.o - .debug_abbrev 0x00000b84 0x1b2 THUMB Debug/../../obj/stm32f10x_spi.o - .debug_abbrev 0x00000d36 0x1ba THUMB Debug/../../obj/stm32f10x_usart.o - .debug_abbrev 0x00000ef0 0x14 THUMB Debug/../../obj/cstart.o - .debug_abbrev 0x00000f04 0xc0 THUMB Debug/../../obj/vectors.o - .debug_abbrev 0x00000fc4 0x2a THUMB Debug/../../obj/can.o - .debug_abbrev 0x00000fee 0xb1 THUMB Debug/../../obj/cpu.o - .debug_abbrev 0x0000109f 0xa5 THUMB Debug/../../obj/nvm.o - .debug_abbrev 0x00001144 0xbb THUMB Debug/../../obj/timer.o - .debug_abbrev 0x000011ff 0x133 THUMB Debug/../../obj/uart.o - .debug_abbrev 0x00001332 0x1e3 THUMB Debug/../../obj/flash.o - .debug_abbrev 0x00001515 0x7e THUMB Debug/../../obj/assert.o - .debug_abbrev 0x00001593 0x5d THUMB Debug/../../obj/backdoor.o - .debug_abbrev 0x000015f0 0x41 THUMB Debug/../../obj/boot.o - .debug_abbrev 0x00001631 0xe2 THUMB Debug/../../obj/com.o - .debug_abbrev 0x00001713 0x41 THUMB Debug/../../obj/cop.o - .debug_abbrev 0x00001754 0x1ab THUMB Debug/../../obj/xcp.o - .debug_abbrev 0x000018ff 0x2c7 THUMB Debug/../../obj/ff.o - .debug_abbrev 0x00001bc6 0xa5 THUMB Debug/../../obj/unicode.o - .debug_abbrev 0x00001c6b 0x1db THUMB Debug/../../obj/file.o - .debug_abbrev 0x00001e46 0xa0 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le.a(libc2.o) - .debug_abbrev 0x00001ee6 0x38 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7m_t_le.a(libdebugio.o) - .debug_abbrev 0x00001f1e 0x25 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le.a(user_libc.o) +.debug_abbrev 0x00000000 0x1f52 + .debug_abbrev 0x00000000 0x1ae THUMB Debug/../../obj/hooks.o + .debug_abbrev 0x000001ae 0x109 THUMB Debug/../../obj/main.o + .debug_abbrev 0x000002b7 0xa9 THUMB Debug/../../obj/core_cm3.o + .debug_abbrev 0x00000360 0x1a8 THUMB Debug/../../obj/system_stm32f10x.o + .debug_abbrev 0x00000508 0x2de THUMB Debug/../../obj/mmc.o + .debug_abbrev 0x000007e6 0x1db THUMB Debug/../../obj/stm32f10x_gpio.o + .debug_abbrev 0x000009c1 0x1d2 THUMB Debug/../../obj/stm32f10x_rcc.o + .debug_abbrev 0x00000b93 0x1b2 THUMB Debug/../../obj/stm32f10x_spi.o + .debug_abbrev 0x00000d45 0x1ba THUMB Debug/../../obj/stm32f10x_usart.o + .debug_abbrev 0x00000eff 0x14 THUMB Debug/../../obj/cstart.o + .debug_abbrev 0x00000f13 0xc0 THUMB Debug/../../obj/vectors.o + .debug_abbrev 0x00000fd3 0x2a THUMB Debug/../../obj/can.o + .debug_abbrev 0x00000ffd 0xb1 THUMB Debug/../../obj/cpu.o + .debug_abbrev 0x000010ae 0xa5 THUMB Debug/../../obj/nvm.o + .debug_abbrev 0x00001153 0xbb THUMB Debug/../../obj/timer.o + .debug_abbrev 0x0000120e 0x133 THUMB Debug/../../obj/uart.o + .debug_abbrev 0x00001341 0x1e3 THUMB Debug/../../obj/flash.o + .debug_abbrev 0x00001524 0x7e THUMB Debug/../../obj/assert.o + .debug_abbrev 0x000015a2 0x5d THUMB Debug/../../obj/backdoor.o + .debug_abbrev 0x000015ff 0x41 THUMB Debug/../../obj/boot.o + .debug_abbrev 0x00001640 0xe2 THUMB Debug/../../obj/com.o + .debug_abbrev 0x00001722 0x41 THUMB Debug/../../obj/cop.o + .debug_abbrev 0x00001763 0x1ab THUMB Debug/../../obj/xcp.o + .debug_abbrev 0x0000190e 0x2c7 THUMB Debug/../../obj/ff.o + .debug_abbrev 0x00001bd5 0xa5 THUMB Debug/../../obj/unicode.o + .debug_abbrev 0x00001c7a 0x1db THUMB Debug/../../obj/file.o + .debug_abbrev 0x00001e55 0xa0 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7m_t_le.a(libc2.o) + .debug_abbrev 0x00001ef5 0x38 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7m_t_le.a(libdebugio.o) + .debug_abbrev 0x00001f2d 0x25 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7m_t_le.a(user_libc.o) .debug_loc 0x00000000 0x9342 .debug_loc 0x00000000 0xdd THUMB Debug/../../obj/hooks.o diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/config.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/blt_conf.h similarity index 97% rename from Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/config.h rename to Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/blt_conf.h index 0bb9fe4c..9df106d1 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/config.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\config.h +* \file Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_STM32_Olimex_STM32P103_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -191,5 +191,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzp b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzp index 608c541a..a13c2880 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzp +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzp @@ -6,8 +6,7 @@ - - + @@ -35,6 +34,7 @@ + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs index 3f9bf2cc..c5cca6e9 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs @@ -40,9 +40,9 @@ - - + + @@ -55,7 +55,7 @@ - + - + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/header.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/header.h index 6e7fe0fb..61e6c3a9 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/header.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f10x.h" /* STM32 register definitions */ #include "stm32f10x_conf.h" /* STM32 peripheral drivers */ #include "boot.h" /* bootloader interface driver */ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs index f1cdd7aa..bcb6258e 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs @@ -51,8 +51,8 @@ - - + + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.elf b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.elf index 7cc20567..9c6d02c0 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.elf and b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.elf differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.map b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.map index f3f212f3..d10183a7 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.map +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/bin/openbtl_olimex_stm32p103.map @@ -20,25 +20,25 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, DATA 2 .bss 00001150 20000008 08004ec4 00010008 2**2 ALLOC - 3 .debug_info 0000afe1 00000000 00000000 00010008 2**0 + 3 .debug_info 0000afe2 00000000 00000000 00010008 2**0 CONTENTS, READONLY, DEBUGGING - 4 .debug_abbrev 0000234e 00000000 00000000 0001afe9 2**0 + 4 .debug_abbrev 0000235d 00000000 00000000 0001afea 2**0 CONTENTS, READONLY, DEBUGGING - 5 .debug_loc 00009479 00000000 00000000 0001d337 2**0 + 5 .debug_loc 00009479 00000000 00000000 0001d347 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_aranges 00000988 00000000 00000000 000267b0 2**0 + 6 .debug_aranges 00000988 00000000 00000000 000267c0 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_ranges 00000aa0 00000000 00000000 00027138 2**0 + 7 .debug_ranges 00000aa0 00000000 00000000 00027148 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_line 00003621 00000000 00000000 00027bd8 2**0 + 8 .debug_line 00003621 00000000 00000000 00027be8 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_str 0000243d 00000000 00000000 0002b1f9 2**0 + 9 .debug_str 0000243d 00000000 00000000 0002b209 2**0 CONTENTS, READONLY, DEBUGGING - 10 .comment 00000030 00000000 00000000 0002d636 2**0 + 10 .comment 00000030 00000000 00000000 0002d646 2**0 CONTENTS, READONLY - 11 .ARM.attributes 00000033 00000000 00000000 0002d666 2**0 + 11 .ARM.attributes 00000033 00000000 00000000 0002d676 2**0 CONTENTS, READONLY - 12 .debug_frame 00001828 00000000 00000000 0002d69c 2**2 + 12 .debug_frame 00001828 00000000 00000000 0002d6ac 2**2 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 08000000 l d .text 00000000 .text diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/config.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/config.h rename to Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/blt_conf.h index 7cd9d4b5..c8090614 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/config.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_STM32_Olimex_STM32P103_GCC\Boot\config.h +* \file Demo\ARMCM3_STM32_Olimex_STM32P103_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_STM32_Olimex_STM32P103_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -191,5 +191,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/ide/DemoBoot.project index fdafaa5d..b08e42e1 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/ide/DemoBoot.project @@ -62,9 +62,9 @@ - + diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/makefile b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/makefile index e5f0f477..53fd5672 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/makefile +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_olimex_stm32p103 #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ ./lib/fatfs/ffconf.h \ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/header.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/header.h index 33502d7e..77fb001b 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/header.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f10x.h" /* STM32 register definitions */ #include "stm32f10x_conf.h" /* STM32 peripheral drivers */ #include "boot.h" /* bootloader interface driver */ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/bin/openbtl_olimex_stm32p103.out b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/bin/openbtl_olimex_stm32p103.out index a2f47d1f..db397b44 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/bin/openbtl_olimex_stm32p103.out and b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/bin/openbtl_olimex_stm32p103.out differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/config.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/config.h rename to Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/blt_conf.h index daf862e6..9cfbe34a 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/config.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM3_STM32_Olimex_STM32P103_IAR\Boot\config.h +* \file Demo\ARMCM3_STM32_Olimex_STM32P103_IAR\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM3_STM32_Olimex_STM32P103_IAR * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -193,5 +193,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/settings/stm32f103.wsdt b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/settings/stm32f103.wsdt index 1cf38b3c..8e02e1d5 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/settings/stm32f103.wsdt +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/settings/stm32f103.wsdt @@ -12,12 +12,12 @@ - 146272727 + 214272727 300Debug-Log20105928270300Build201413664941138 - + TabID-32216-31616 @@ -29,20 +29,20 @@ - 0TabID-13144-32069BuildBuildTabID-25023-6652Debug LogDebug-LogTabID-18334-26223Find in FilesFind-in-Files0 + 0TabID-13144-32069BuildBuildTabID-25023-6652Debug LogDebug-LogTabID-18334-26223Find in FilesFind-in-Files0 - TextEditor$WS_DIR$\..\main.c000001621982198TextEditor$WS_DIR$\..\config.h0000080691769171TextEditor$WS_DIR$\..\hooks.c000002661385313853TextEditor$WS_DIR$\..\lib\fatfs\mmc.c00000109464846700100000010000001 + TextEditor$WS_DIR$\..\main.c000001621982198TextEditor$WS_DIR$\..\hooks.c0000026613853138531TextEditor$WS_DIR$\..\lib\fatfs\mmc.c00000109464846700100000010000001 - iaridepm.enu1-2-2417237-2-2137116135913202091237103729965-2-21121010-2-210121141003968198606104167198606 + iaridepm.enu1-2-2617305-2-2176166136012201701237249752126-2-21611296-2-212981631003091198056104328198056 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.dep b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.dep index 9a6ccf67..5b0df865 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.dep +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.dep @@ -2,7 +2,7 @@ 2 - 1099931003 + 965510063 Debug @@ -62,18 +62,18 @@ $PROJ_DIR$\..\..\..\..\Source\plausibility.h $PROJ_DIR$\..\..\..\..\Source\xcp.c $PROJ_DIR$\..\..\..\..\Source\xcp.h - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_adc.h $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_adc.h $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_can.h - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_cec.h - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_crc.h $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_crc.h + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_bkp.h - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\misc.c + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_can.h $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\Debug\Obj\stm32f10x_crc.o $PROJ_DIR$\Debug\Obj\stm32f10x_i2c.o $PROJ_DIR$\..\obj\system_stm32f10x.lst @@ -113,6 +113,129 @@ $PROJ_DIR$\..\obj\assert.o $PROJ_DIR$\..\obj\stm32f10x_gpio.pbi $PROJ_DIR$\..\bin\stm32f103.out + $TOOLKIT_DIR$\inc\c\ycheck.h + $PROJ_DIR$\Debug\Obj\stm32f10x_cec.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.o + $PROJ_DIR$\Debug\Obj\stm32f10x_iwdg.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_sdio.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_spi.pbi + $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h + $PROJ_DIR$\Debug\Obj\stm32f10x_sdio.o + $PROJ_DIR$\..\obj\assert.lst + $PROJ_DIR$\..\obj\openbtl_olimex_stm32p103.map + $PROJ_DIR$\..\obj\flash.lst + $PROJ_DIR$\..\obj\backdoor.lst + $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.srec + $PROJ_DIR$\..\obj\hooks.pbi + $PROJ_DIR$\..\obj\hooks.o + $PROJ_DIR$\..\obj\cpu.lst + $PROJ_DIR$\..\obj\uart.lst + $PROJ_DIR$\..\obj\can.lst + $PROJ_DIR$\..\obj\cop.lst + $PROJ_DIR$\..\obj\com.lst + $PROJ_DIR$\..\obj\stm32f10x_sdio.o + $PROJ_DIR$\..\obj\stm32f10x_spi.o + $PROJ_DIR$\..\..\..\..\Source\ARMCM3_STM32\IAR\memory.x + $PROJ_DIR$\..\obj\stm32f10x_tim.o + $PROJ_DIR$\..\obj\stm32f10x_usart.o + $PROJ_DIR$\..\obj\stm32f10x_wwdg.o + $PROJ_DIR$\..\obj\system_stm32f10x.o + $PROJ_DIR$\..\obj\app.o + $PROJ_DIR$\..\obj\core_cm3.pbi + $PROJ_DIR$\..\obj\misc.pbi + $PROJ_DIR$\..\obj\hw.o + $PROJ_DIR$\..\obj\os.o + $PROJ_DIR$\..\obj\stm32f10x_wwdg.lst + $PROJ_DIR$\..\obj\stm32f10x_cec.lst + $PROJ_DIR$\Debug\Obj\stm32f10x_exti.pbi + $PROJ_DIR$\..\obj\stm32f10x_bkp.lst + $PROJ_DIR$\..\obj\stm32f10x_can.lst + $PROJ_DIR$\..\obj\stm32f10x_adc.lst + $PROJ_DIR$\..\obj\stm32f10x_crc.lst + $PROJ_DIR$\..\obj\misc.lst + $PROJ_DIR$\..\obj\stm32f10x_dac.lst + $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.lst + $PROJ_DIR$\..\obj\stm32f10x_exti.lst + $PROJ_DIR$\..\obj\stm32f10x_flash.lst + $PROJ_DIR$\..\obj\stm32f10x_fsmc.lst + $PROJ_DIR$\..\obj\stm32f10x_gpio.lst + $PROJ_DIR$\..\obj\stm32f10x_i2c.lst + $PROJ_DIR$\..\obj\stm32f10x_iwdg.lst + $PROJ_DIR$\..\obj\stm32f10x_pwr.lst + $PROJ_DIR$\..\obj\stm32f10x_rcc.lst + $PROJ_DIR$\..\obj\stm32f10x_rtc.lst + $PROJ_DIR$\..\obj\stm32f10x_sdio.lst + $PROJ_DIR$\..\obj\stm32f10x_spi.lst + $PROJ_DIR$\..\obj\stm32f10x_dma.lst + $PROJ_DIR$\..\obj\stm32f10x_tim.lst + $PROJ_DIR$\..\obj\stm32f10x_usart.lst + $TOOLKIT_DIR$\inc\c\xencoding_limits.h + $PROJ_DIR$\Debug\Obj\stm32f10x_i2c.pbi + $TOOLKIT_DIR$\lib\dl7M_tln.a + $PROJ_DIR$\Debug\Obj\misc.pbi + $TOOLKIT_DIR$\inc\c\DLib_Threads.h + $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.o + $PROJ_DIR$\Debug\Obj\stm32f10x_rtc.o + $TOOLKIT_DIR$\lib\rt7M_tl.a + $PROJ_DIR$\Debug\Obj\stm32f10x_fsmc.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_gpio.o + $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.o + $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_dma.o + $PROJ_DIR$\Debug\Obj\stm32f10x_exti.o + $PROJ_DIR$\Debug\Obj\stm32f10x_flash.o + $PROJ_DIR$\Debug\Obj\stm32f10x_dac.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_dma.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_flash.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_tim.o + $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.pbi + $PROJ_DIR$\..\obj\stm32f10x_bkp.pbi + $PROJ_DIR$\..\obj\stm32f10x_can.pbi + $PROJ_DIR$\..\obj\stm32f10x_cec.pbi + $PROJ_DIR$\..\obj\stm32f10x_crc.pbi + $PROJ_DIR$\..\obj\stm32f10x_dac.pbi + $PROJ_DIR$\..\obj\stm32f10x_dma.pbi + $PROJ_DIR$\..\obj\stm32f10x_exti.pbi + $PROJ_DIR$\..\obj\hw.pbi + $PROJ_DIR$\Debug\Obj\os.pbi + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $PROJ_DIR$\Debug\Obj\stm32f10x_crc.pbi + $PROJ_DIR$\Debug\Obj\core_cm3.o + $TOOLKIT_DIR$\inc\c\yvals.h + $PROJ_DIR$\Debug\Obj\stm32f10x_rtc.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_usart.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_can.o + $PROJ_DIR$\Debug\Obj\stm32f10x_cec.o + $PROJ_DIR$\Debug\Exe\stm32f103.out + $PROJ_DIR$\..\obj\flash.pbi + $PROJ_DIR$\..\obj\cpu.pbi + $PROJ_DIR$\..\obj\nvm.pbi + $PROJ_DIR$\..\obj\uart.pbi + $PROJ_DIR$\..\obj\usb.pbi + $PROJ_DIR$\..\obj\mmc.o + $PROJ_DIR$\..\obj\mmc.pbi + $PROJ_DIR$\..\obj\unicode.lst + $PROJ_DIR$\..\obj\ff.lst + $TOOLKIT_DIR$\inc\c\stdarg.h + $PROJ_DIR$\..\obj\file.o + $PROJ_DIR$\..\obj\file.pbi + $TOOLKIT_DIR$\inc\c\xtls.h + $TOOLKIT_DIR$\inc\c\xmtx.h + $TOOLKIT_DIR$\inc\c\xlocaleuse.h + $TOOLKIT_DIR$\inc\c\xlocale.h + $TOOLKIT_DIR$\inc\c\stdlib.h + $PROJ_DIR$\..\obj\file.lst + $PROJ_DIR$\..\..\..\..\Source\fatfs\src\option\ccsbcs.c + $TOOLKIT_DIR$\inc\c\xlocale_c.h + $TOOLKIT_DIR$\inc\c\wchar.h + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h + $PROJ_DIR$\..\cstart.s + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c @@ -251,10 +374,10 @@ $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_cec.h $PROJ_DIR$\..\lib\stdperiphlib\stm32f10x_conf.h - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.h $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.h $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_crc.h + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c $TOOLKIT_DIR$\inc\c\intrinsics.h $PROJ_DIR$\Debug\Obj\stm32f10x_usart.o $PROJ_DIR$\Debug\Obj\core_cm3.pbi @@ -293,149 +416,27 @@ $PROJ_DIR$\..\obj\stm32f10x_adc.o $TOOLKIT_DIR$\lib\shb_l.a $PROJ_DIR$\..\memory.x - $TOOLKIT_DIR$\inc\c\ycheck.h - $PROJ_DIR$\Debug\Obj\stm32f10x_cec.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.o - $PROJ_DIR$\Debug\Obj\stm32f10x_iwdg.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_sdio.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_spi.pbi - $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h - $PROJ_DIR$\Debug\Obj\stm32f10x_sdio.o - $PROJ_DIR$\..\obj\assert.lst - $PROJ_DIR$\..\obj\openbtl_olimex_stm32p103.map - $PROJ_DIR$\..\obj\flash.lst - $PROJ_DIR$\..\obj\backdoor.lst - $PROJ_DIR$\..\bin\openbtl_olimex_stm32p103.srec - $PROJ_DIR$\..\obj\hooks.pbi - $PROJ_DIR$\..\obj\hooks.o - $PROJ_DIR$\..\obj\cpu.lst - $PROJ_DIR$\..\obj\uart.lst - $PROJ_DIR$\..\obj\can.lst - $PROJ_DIR$\..\obj\cop.lst - $PROJ_DIR$\..\obj\com.lst - $PROJ_DIR$\..\obj\stm32f10x_sdio.o - $PROJ_DIR$\..\..\..\..\Source\ARMCM3_STM32\IAR\memory.x - $PROJ_DIR$\..\obj\stm32f10x_spi.o - $PROJ_DIR$\..\obj\stm32f10x_tim.o - $PROJ_DIR$\..\obj\stm32f10x_usart.o - $PROJ_DIR$\..\obj\stm32f10x_wwdg.o - $PROJ_DIR$\..\obj\system_stm32f10x.o - $PROJ_DIR$\..\obj\app.o - $PROJ_DIR$\..\obj\core_cm3.pbi - $PROJ_DIR$\..\obj\misc.pbi - $PROJ_DIR$\..\obj\hw.o - $PROJ_DIR$\..\obj\os.o - $PROJ_DIR$\..\obj\stm32f10x_wwdg.lst - $PROJ_DIR$\..\obj\stm32f10x_cec.lst - $PROJ_DIR$\Debug\Obj\stm32f10x_exti.pbi - $PROJ_DIR$\..\obj\stm32f10x_bkp.lst - $PROJ_DIR$\..\obj\stm32f10x_can.lst - $PROJ_DIR$\..\obj\stm32f10x_adc.lst - $PROJ_DIR$\..\obj\stm32f10x_crc.lst - $PROJ_DIR$\..\obj\misc.lst - $PROJ_DIR$\..\obj\stm32f10x_dac.lst - $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.lst - $PROJ_DIR$\..\obj\stm32f10x_exti.lst - $PROJ_DIR$\..\obj\stm32f10x_flash.lst - $PROJ_DIR$\..\obj\stm32f10x_fsmc.lst - $PROJ_DIR$\..\obj\stm32f10x_gpio.lst - $PROJ_DIR$\..\obj\stm32f10x_i2c.lst - $PROJ_DIR$\..\obj\stm32f10x_iwdg.lst - $PROJ_DIR$\..\obj\stm32f10x_pwr.lst - $PROJ_DIR$\..\obj\stm32f10x_rcc.lst - $PROJ_DIR$\..\obj\stm32f10x_rtc.lst - $PROJ_DIR$\..\obj\stm32f10x_sdio.lst - $PROJ_DIR$\..\obj\stm32f10x_spi.lst - $PROJ_DIR$\..\obj\stm32f10x_dma.lst - $PROJ_DIR$\..\obj\stm32f10x_tim.lst - $PROJ_DIR$\..\obj\stm32f10x_usart.lst - $TOOLKIT_DIR$\inc\c\xencoding_limits.h - $PROJ_DIR$\Debug\Obj\stm32f10x_i2c.pbi - $TOOLKIT_DIR$\lib\dl7M_tln.a - $PROJ_DIR$\Debug\Obj\misc.pbi - $TOOLKIT_DIR$\inc\c\DLib_Threads.h - $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.o - $PROJ_DIR$\Debug\Obj\stm32f10x_rtc.o - $TOOLKIT_DIR$\lib\rt7M_tl.a - $PROJ_DIR$\Debug\Obj\stm32f10x_fsmc.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_gpio.o - $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.o - $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_dma.o - $PROJ_DIR$\Debug\Obj\stm32f10x_exti.o - $PROJ_DIR$\Debug\Obj\stm32f10x_flash.o - $PROJ_DIR$\Debug\Obj\stm32f10x_dac.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_dma.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_flash.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_tim.o - $PROJ_DIR$\..\obj\stm32f10x_dbgmcu.pbi - $PROJ_DIR$\..\obj\stm32f10x_bkp.pbi - $PROJ_DIR$\..\obj\stm32f10x_can.pbi - $PROJ_DIR$\..\obj\stm32f10x_cec.pbi - $PROJ_DIR$\..\obj\stm32f10x_crc.pbi - $PROJ_DIR$\..\obj\stm32f10x_dac.pbi - $PROJ_DIR$\..\obj\stm32f10x_dma.pbi - $PROJ_DIR$\..\obj\stm32f10x_exti.pbi - $PROJ_DIR$\..\obj\hw.pbi - $PROJ_DIR$\Debug\Obj\os.pbi - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $PROJ_DIR$\Debug\Obj\stm32f10x_crc.pbi - $PROJ_DIR$\Debug\Obj\core_cm3.o - $TOOLKIT_DIR$\inc\c\yvals.h - $PROJ_DIR$\Debug\Obj\stm32f10x_rtc.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_usart.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_can.o - $PROJ_DIR$\Debug\Obj\stm32f10x_cec.o - $PROJ_DIR$\Debug\Exe\stm32f103.out - $PROJ_DIR$\..\obj\flash.pbi - $PROJ_DIR$\..\obj\cpu.pbi - $PROJ_DIR$\..\obj\nvm.pbi - $PROJ_DIR$\..\obj\uart.pbi - $PROJ_DIR$\..\obj\usb.pbi - $PROJ_DIR$\..\obj\mmc.o - $PROJ_DIR$\..\obj\mmc.pbi - $PROJ_DIR$\..\obj\unicode.lst - $PROJ_DIR$\..\obj\ff.lst - $TOOLKIT_DIR$\inc\c\stdarg.h - $PROJ_DIR$\..\obj\file.o - $PROJ_DIR$\..\obj\file.pbi - $TOOLKIT_DIR$\inc\c\xtls.h - $TOOLKIT_DIR$\inc\c\xmtx.h - $TOOLKIT_DIR$\inc\c\xlocaleuse.h - $TOOLKIT_DIR$\inc\c\xlocale.h - $TOOLKIT_DIR$\inc\c\stdlib.h - $PROJ_DIR$\..\..\..\..\Source\fatfs\src\option\ccsbcs.c - $PROJ_DIR$\..\obj\file.lst - $TOOLKIT_DIR$\inc\c\xlocale_c.h - $TOOLKIT_DIR$\inc\c\wchar.h - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h - $PROJ_DIR$\..\cstart.s - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c $PROJ_DIR$\..\lib\CMSIS\CM3\CoreSupport\core_cm3.c BICOMP - 317 + 137 ICCARM - 117 152 + 240 275 BICOMP - 119 287 378 141 295 375 345 349 + 242 107 198 264 115 195 165 169 ICCARM - 119 287 378 141 295 375 345 349 + 242 107 198 264 115 195 165 169 @@ -444,21 +445,21 @@ BICOMP - 232 + 355 ICCARM - 70 315 + 70 135 BICOMP - 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -467,21 +468,21 @@ BICOMP - 390 + 210 ICCARM - 186 389 + 309 209 BICOMP - 37 40 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 46 32 42 16 53 25 50 29 27 31 44 52 38 5 48 55 + 37 40 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 46 32 42 229 53 25 50 29 27 31 44 52 38 5 48 55 ICCARM - 37 40 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 46 32 42 16 53 25 50 29 27 31 44 52 38 5 48 55 + 37 40 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 46 32 42 229 53 25 50 29 27 31 44 52 38 5 48 55 @@ -494,17 +495,17 @@ ICCARM - 334 258 + 154 381 BICOMP - 9 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 9 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 9 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 9 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -513,17 +514,17 @@ BICOMP - 218 + 341 ICCARM - 338 100 + 158 100 ICCARM - 11 3 0 119 287 378 141 295 375 345 349 249 1 7 9 13 15 + 11 3 0 242 107 198 264 115 195 165 169 372 1 7 9 13 15 @@ -532,21 +533,21 @@ BICOMP - 226 + 349 ICCARM - 341 311 + 161 130 BICOMP - 13 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 15 + 13 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 15 ICCARM - 13 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 15 + 13 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 15 @@ -555,21 +556,21 @@ BICOMP - 222 + 345 ICCARM - 344 313 + 164 133 BICOMP - 15 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 + 15 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 ICCARM - 15 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 + 15 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 @@ -578,21 +579,21 @@ BICOMP - 302 + 122 ICCARM - 102 303 + 102 123 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -601,21 +602,21 @@ BICOMP - 204 + 327 ICCARM - 210 73 + 333 73 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -624,21 +625,21 @@ BICOMP - 206 + 329 ICCARM - 209 199 + 332 322 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -647,7 +648,7 @@ AARM - 190 + 313 @@ -656,7 +657,7 @@ ILINK - 103 298 + 103 118 @@ -669,17 +670,17 @@ ICCARM - 306 91 + 126 91 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -688,21 +689,21 @@ BICOMP - 188 + 311 ICCARM - 392 187 + 212 310 BICOMP - 38 40 5 37 393 287 378 141 295 375 345 349 + 38 40 5 37 213 107 198 264 115 195 165 169 ICCARM - 38 40 5 37 393 287 378 141 295 375 345 349 + 38 40 5 37 213 107 198 264 115 195 165 169 @@ -711,21 +712,21 @@ BICOMP - 385 + 205 ICCARM - 304 93 + 124 93 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -734,21 +735,21 @@ BICOMP - 384 + 204 ICCARM - 299 94 + 119 94 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -757,7 +758,7 @@ BICOMP - 386 + 206 ICCARM @@ -767,11 +768,11 @@ BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -780,21 +781,21 @@ BICOMP - 205 + 328 ICCARM - 211 200 + 334 323 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -803,21 +804,21 @@ BICOMP - 387 + 207 ICCARM - 305 96 + 125 96 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -826,7 +827,7 @@ BICOMP - 388 + 208 ICCARM @@ -836,11 +837,11 @@ BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -853,17 +854,17 @@ ICCARM - 297 104 + 117 104 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -872,21 +873,21 @@ BICOMP - 185 + 308 ICCARM - 391 184 + 211 307 BICOMP - 38 40 5 401 + 38 40 5 222 ICCARM - 38 40 5 401 + 38 40 5 222 @@ -899,17 +900,17 @@ ICCARM - 300 79 + 120 79 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -918,21 +919,21 @@ BICOMP - 201 + 324 ICCARM - 207 75 + 330 75 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -945,17 +946,17 @@ ICCARM - 308 82 + 128 82 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 34 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 34 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 34 @@ -968,17 +969,17 @@ ICCARM - 307 81 + 127 81 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -987,21 +988,21 @@ BICOMP - 395 + 215 ICCARM - 402 394 + 221 214 BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 123 287 378 141 295 375 345 349 120 121 122 399 396 397 400 398 403 404 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 246 107 198 264 115 195 165 169 243 244 245 219 216 217 220 218 223 224 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 123 287 378 141 295 375 345 349 120 121 122 399 396 397 400 398 403 404 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 246 107 198 264 115 195 165 169 243 244 245 219 216 217 220 218 223 224 @@ -1020,11 +1021,11 @@ BICOMP - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 ICCARM - 46 32 42 16 53 25 50 29 27 31 44 52 38 40 5 48 55 + 46 32 42 229 53 25 50 29 27 31 44 52 38 40 5 48 55 @@ -1033,21 +1034,21 @@ BICOMP - 193 + 316 ICCARM - 326 284 + 146 407 BICOMP - 56 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 57 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 56 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 57 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1056,67 +1057,21 @@ BICOMP - 367 + 187 ICCARM - 325 147 + 145 270 BICOMP - 59 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 65 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 59 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 - - - - - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c - - - BICOMP - 368 - - - ICCARM - 322 146 - - - - - BICOMP - 62 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 - - - ICCARM - 62 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 - - - - - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - - - BICOMP - 369 - - - ICCARM - 327 145 - - - - - BICOMP - 63 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 - - - ICCARM - 63 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 65 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1125,21 +1080,90 @@ BICOMP - 366 + 186 ICCARM - 324 150 + 144 273 BICOMP - 65 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 63 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 65 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 63 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 + + + + + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c + + + BICOMP + 189 + + + ICCARM + 147 268 + + + + + BICOMP + 61 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 + + + ICCARM + 61 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 + + + + + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c + + + BICOMP + 188 + + + ICCARM + 142 269 + + + + + BICOMP + 59 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 + + + ICCARM + 59 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 + + + + + $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c + + + BICOMP + 190 + + + ICCARM + 149 320 + + + + + BICOMP + 382 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 + + + ICCARM + 382 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1148,33 +1172,10 @@ BICOMP - 318 + 138 - - $PROJ_DIR$\..\lib\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c - - - BICOMP - 370 - - - ICCARM - 329 197 - - - - - BICOMP - 259 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 - - - ICCARM - 259 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 - - - $PROJ_DIR$\..\bin\demoprog_olimex_stm32p103.out @@ -1186,7 +1187,7 @@ ILINK - 286 75 152 190 72 74 73 149 284 150 147 146 145 197 196 198 213 214 191 258 97 98 99 100 101 309 311 312 313 314 315 200 199 285 352 216 347 + 409 75 275 313 72 74 73 272 407 273 270 269 268 320 319 321 336 337 314 381 97 98 99 100 101 129 130 132 133 134 135 323 322 408 172 339 167 @@ -1195,17 +1196,17 @@ ILINK - 298 + 118 OBJCOPY - 301 + 121 ILINK - 310 104 79 75 91 82 81 152 93 190 187 394 94 303 73 389 90 258 100 311 313 315 200 96 184 92 199 78 285 352 216 347 + 131 104 79 75 91 82 81 275 93 313 310 214 94 123 73 209 90 381 100 130 133 135 323 96 307 92 322 78 408 172 339 167 @@ -1214,13 +1215,69 @@ OBJCOPY - 221 + 344 ILINK - 286 75 152 190 72 74 73 149 284 150 147 146 145 197 196 198 213 214 191 258 97 98 99 100 101 309 311 312 313 314 315 200 199 285 352 216 347 + 409 75 275 313 72 74 73 272 407 273 270 269 268 320 319 321 336 337 314 381 97 98 99 100 101 129 130 132 133 134 135 323 322 408 172 339 167 + + + + + $PROJ_DIR$\Debug\Exe\stm32f103.out + + + ILINK + 409 315 197 274 282 267 312 278 201 202 68 277 175 177 178 179 261 174 69 281 109 170 171 116 375 184 373 376 380 408 172 339 167 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c + + + BICOMP + 355 + + + ICCARM + 70 135 + + + + + ICCARM + 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 + + + + + $PROJ_DIR$\..\cstart.s + + + AARM + 313 + + + + + $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c + + + BICOMP + 353 + + + ICCARM + 160 129 + + + + + ICCARM + 237 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 238 230 235 233 362 @@ -1229,17 +1286,17 @@ BICOMP - 223 + 346 ICCARM - 343 312 + 163 132 ICCARM - 107 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 112 110 239 + 230 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 235 233 362 @@ -1248,17 +1305,17 @@ BICOMP - 219 + 342 ICCARM - 321 314 + 141 134 ICCARM - 110 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 239 + 233 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 362 @@ -1267,17 +1324,17 @@ BICOMP - 222 + 345 ICCARM - 344 313 + 164 133 ICCARM - 112 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 110 239 + 235 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 233 362 @@ -1286,17 +1343,17 @@ BICOMP - 226 + 349 ICCARM - 341 311 + 161 130 ICCARM - 115 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 107 112 110 239 + 238 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 230 235 233 362 @@ -1305,17 +1362,17 @@ BICOMP - 201 + 324 ICCARM - 207 75 + 330 75 ICCARM - 126 16 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 125 128 130 132 + 249 16 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 248 251 253 255 @@ -1324,17 +1381,17 @@ BICOMP - 202 + 325 ICCARM - 212 72 + 335 72 ICCARM - 126 16 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 125 128 130 132 + 249 16 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 248 251 253 255 @@ -1343,17 +1400,17 @@ BICOMP - 203 + 326 ICCARM - 208 74 + 331 74 ICCARM - 126 16 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 125 128 130 132 + 249 16 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 248 251 253 255 @@ -1362,17 +1419,17 @@ BICOMP - 205 + 328 ICCARM - 211 200 + 334 323 ICCARM - 126 16 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 125 128 130 132 + 249 16 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 248 251 253 255 @@ -1381,17 +1438,17 @@ BICOMP - 206 + 329 ICCARM - 209 199 + 332 322 ICCARM - 126 16 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 125 128 130 132 + 249 16 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 248 251 253 255 @@ -1400,17 +1457,17 @@ BICOMP - 224 + 347 ICCARM - 153 316 + 276 136 ICCARM - 139 137 142 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 135 + 262 260 265 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 258 @@ -1419,7 +1476,7 @@ AARM - 190 + 313 @@ -1428,17 +1485,17 @@ BICOMP - 231 + 354 ICCARM - 71 320 + 71 140 ICCARM - 137 + 260 @@ -1447,17 +1504,17 @@ BICOMP - 373 + 193 ICCARM - 116 319 + 239 139 ICCARM - 139 137 142 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 135 + 262 260 265 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 258 @@ -1470,13 +1527,13 @@ ICCARM - 334 258 + 154 381 ICCARM - 174 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 181 178 177 179 183 114 115 107 112 110 239 + 297 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 304 301 300 302 306 237 238 230 235 233 362 @@ -1485,17 +1542,17 @@ BICOMP - 370 + 190 ICCARM - 329 197 + 149 320 ICCARM - 160 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 283 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1504,17 +1561,17 @@ BICOMP - 215 + 338 ICCARM - 332 214 + 152 337 ICCARM - 164 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 173 174 181 178 177 179 183 114 115 107 112 110 239 + 287 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1523,17 +1580,17 @@ BICOMP - 371 + 191 ICCARM - 342 198 + 162 321 ICCARM - 165 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 288 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1542,17 +1599,17 @@ BICOMP - 372 + 192 ICCARM - 331 213 + 151 336 ICCARM - 163 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 286 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1561,17 +1618,17 @@ BICOMP - 365 + 185 ICCARM - 330 196 + 150 319 ICCARM - 170 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 293 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1580,17 +1637,17 @@ BICOMP - 220 + 343 ICCARM - 333 191 + 153 314 ICCARM - 173 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 174 181 178 177 179 183 114 115 107 112 110 239 + 296 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1599,17 +1656,17 @@ BICOMP - 228 + 351 ICCARM - 335 97 + 155 97 ICCARM - 181 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 178 177 179 183 114 115 107 112 110 239 + 304 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 301 300 302 306 237 238 230 235 233 362 @@ -1618,17 +1675,17 @@ BICOMP - 229 + 352 ICCARM - 337 99 + 157 99 ICCARM - 177 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 179 183 114 115 107 112 110 239 + 300 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 302 306 237 238 230 235 233 362 @@ -1637,17 +1694,17 @@ BICOMP - 218 + 341 ICCARM - 338 100 + 158 100 ICCARM - 179 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 183 114 115 107 112 110 239 + 302 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 306 237 238 230 235 233 362 @@ -1656,17 +1713,17 @@ BICOMP - 227 + 350 ICCARM - 336 98 + 156 98 ICCARM - 178 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 177 179 183 114 115 107 112 110 239 + 301 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 300 302 306 237 238 230 235 233 362 @@ -1675,17 +1732,17 @@ BICOMP - 217 + 340 ICCARM - 339 101 + 159 101 ICCARM - 183 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 114 115 107 112 110 239 + 306 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 237 238 230 235 233 362 @@ -1694,7 +1751,7 @@ BILINK - 157 251 156 348 374 254 255 256 288 376 360 361 362 323 363 353 148 346 290 291 293 379 292 294 118 380 356 194 + 280 374 279 168 194 377 378 379 108 196 180 181 182 143 183 173 271 166 110 111 113 199 112 114 241 200 176 317 @@ -1703,17 +1760,17 @@ BICOMP - 318 + 138 ICCARM - 328 149 + 148 272 ICCARM - 239 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 + 362 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 @@ -1722,17 +1779,17 @@ BICOMP - 366 + 186 ICCARM - 324 150 + 144 273 ICCARM - 235 234 245 119 287 378 141 295 375 345 349 249 406 244 240 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 358 357 369 242 107 198 264 115 195 165 169 372 226 367 363 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1741,17 +1798,17 @@ BICOMP - 193 + 316 ICCARM - 326 284 + 146 407 ICCARM - 240 234 245 119 287 378 141 295 375 345 349 249 406 244 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 363 357 369 242 107 198 264 115 195 165 169 372 226 367 358 364 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1760,17 +1817,17 @@ BICOMP - 367 + 187 ICCARM - 325 147 + 145 270 ICCARM - 241 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 364 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 366 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1779,17 +1836,17 @@ BICOMP - 368 + 188 ICCARM - 322 146 + 142 269 ICCARM - 243 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 366 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 370 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1798,17 +1855,17 @@ BICOMP - 369 + 189 ICCARM - 327 145 + 147 268 ICCARM - 248 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 + 370 357 369 242 107 198 264 115 195 165 169 372 226 367 363 358 364 366 283 293 288 286 287 296 297 304 301 300 302 306 237 238 230 235 233 362 @@ -1817,17 +1874,17 @@ BICOMP - 317 + 137 ICCARM - 117 152 + 240 275 ICCARM - 119 287 378 141 295 375 345 349 + 242 107 198 264 115 195 165 169 @@ -1836,21 +1893,21 @@ BICOMP - 365 + 185 ICCARM - 330 196 + 150 319 BICOMP - 261 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 384 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 261 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 384 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1859,21 +1916,21 @@ BICOMP - 371 + 191 ICCARM - 342 198 + 162 321 BICOMP - 263 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 386 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 263 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 386 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1882,21 +1939,21 @@ BICOMP - 372 + 192 ICCARM - 331 213 + 151 336 BICOMP - 265 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 388 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 265 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 388 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1905,21 +1962,21 @@ BICOMP - 215 + 338 ICCARM - 332 214 + 152 337 BICOMP - 267 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 390 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 ICCARM - 267 3 0 119 287 378 141 295 375 345 349 249 1 7 9 11 13 15 + 390 3 0 242 107 198 264 115 195 165 169 372 1 7 9 11 13 15 @@ -1928,21 +1985,21 @@ BICOMP - 220 + 343 ICCARM - 333 191 + 153 314 BICOMP - 269 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 392 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 269 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 392 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -1951,21 +2008,21 @@ BICOMP - 228 + 351 ICCARM - 335 97 + 155 97 BICOMP - 271 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 394 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 271 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 394 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -1974,21 +2031,21 @@ BICOMP - 227 + 350 ICCARM - 336 98 + 156 98 BICOMP - 273 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 396 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 273 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 396 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -1997,21 +2054,21 @@ BICOMP - 229 + 352 ICCARM - 337 99 + 157 99 BICOMP - 275 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 398 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 275 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 398 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -2020,21 +2077,21 @@ BICOMP - 217 + 340 ICCARM - 339 101 + 159 101 BICOMP - 277 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 400 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 277 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 400 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -2043,21 +2100,21 @@ BICOMP - 230 + 353 ICCARM - 340 309 + 160 129 BICOMP - 279 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 402 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 279 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 402 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -2066,21 +2123,21 @@ BICOMP - 223 + 346 ICCARM - 343 312 + 163 132 BICOMP - 281 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 404 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 281 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 404 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 @@ -2089,77 +2146,21 @@ BICOMP - 219 + 342 ICCARM - 321 314 + 141 134 BICOMP - 283 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 + 406 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 ICCARM - 283 3 0 119 287 378 141 295 375 345 349 249 1 7 11 13 15 - - - - - $PROJ_DIR$\Debug\Exe\stm32f103.out - - - ILINK - 286 192 377 151 159 144 189 155 381 382 68 154 355 357 358 359 138 354 69 158 289 350 351 296 252 364 250 253 257 285 352 216 347 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c - - - BICOMP - 232 - - - ICCARM - 70 315 - - - - - ICCARM - 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 114 115 107 112 110 239 - - - - - $PROJ_DIR$\..\cstart.s - - - AARM - 190 - - - - - $PROJ_DIR$\..\lib\stdperiphlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c - - - BICOMP - 230 - - - ICCARM - 340 309 - - - - - ICCARM - 114 234 245 119 287 378 141 295 375 345 349 249 406 244 240 235 241 243 248 160 170 165 163 164 173 174 181 178 177 179 183 115 107 112 110 239 + 406 3 0 242 107 198 264 115 195 165 169 372 1 7 11 13 15 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.ewp b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.ewp index 374c045d..f7c5d908 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.ewp +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Boot/ide/stm32f103.ewp @@ -1907,7 +1907,7 @@ - $PROJ_DIR$\..\config.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\hooks.c diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/bin/demoprog_olimex_stm32p103.out b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/bin/demoprog_olimex_stm32p103.out index d5bfe54f..4a94f826 100644 Binary files a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/bin/demoprog_olimex_stm32p103.out and b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/bin/demoprog_olimex_stm32p103.out differ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/header.h b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/header.h index 53d7752c..923326d3 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/header.h +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f10x.h" /* STM32 register definitions */ #include "stm32f10x_conf.h" /* STM32 peripheral drivers */ #include "boot.h" /* bootloader interface driver */ diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/settings/stm32f103.wsdt b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/settings/stm32f103.wsdt index 1bb5a637..749c16ae 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/settings/stm32f103.wsdt +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/settings/stm32f103.wsdt @@ -12,12 +12,12 @@ - 146272727 + 231272727 20105928270201413 - + TabID-32216-31616 @@ -29,7 +29,7 @@ - 0TabID-12497-1878BuildBuildTabID-2690-2881Debug LogDebug-Log0 + 0TabID-12497-1878BuildBuildTabID-2690-2881Debug LogDebug-Log0 @@ -42,7 +42,7 @@ - iaridepm.enu1-2-2395237-2-2138116136905202091237103691638-2-21341010-2-210121361003968236934136905202091 + iaridepm.enu1-2-2585305-2-2177166136785201701237249713244-2-21931296-2-212981951003091236938136785201701 diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/stm32f103.dep b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/stm32f103.dep index be4d72f4..16164e35 100644 --- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/stm32f103.dep +++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_IAR/Prog/ide/stm32f103.dep @@ -73,13 +73,13 @@ $TOOLKIT_DIR$\lib\m7M_tl.a $PROJ_DIR$\..\obj\stm32f10x_rtc.pbi $PROJ_DIR$\..\obj\stm32f10x_rcc.pbi - $PROJ_DIR$\..\obj\stm32f10x_wwdg.pbi - $PROJ_DIR$\..\obj\app.pbi - $PROJ_DIR$\..\bin\stm32f103.srec $PROJ_DIR$\..\obj\stm32f10x_usart.pbi - $PROJ_DIR$\..\obj\stm32f10x_tim.pbi $PROJ_DIR$\..\obj\stm32f10x_fsmc.pbi + $PROJ_DIR$\..\obj\stm32f10x_tim.pbi + $PROJ_DIR$\..\bin\stm32f103.srec $PROJ_DIR$\..\obj\stm32f103.pbd + $PROJ_DIR$\..\obj\app.pbi + $PROJ_DIR$\..\obj\stm32f10x_wwdg.pbi $PROJ_DIR$\..\obj\stm32f10x_spi.pbi $PROJ_DIR$\..\obj\stm32f10x_iwdg.pbi $PROJ_DIR$\..\obj\stm32f10x_i2c.pbi @@ -260,6 +260,7 @@ $PROJ_DIR$\..\obj\stm32f10x_exti.o $PROJ_DIR$\..\obj\stm32f10x_flash.o $PROJ_DIR$\..\obj\stm32f10x_flash.pbi + $PROJ_DIR$\..\..\Boot\blt_conf.h $PROJ_DIR$\..\lib\stdperiphlib\CMSIS\CM3\CoreSupport\core_cm3.c @@ -547,7 +548,7 @@ BICOMP - 72 + 68 ICCARM @@ -754,7 +755,7 @@ BICOMP - 71 + 69 ICCARM @@ -777,7 +778,7 @@ BICOMP - 70 + 67 ICCARM @@ -800,7 +801,7 @@ BICOMP - 67 + 73 ICCARM @@ -860,7 +861,7 @@ ICCARM - 55 243 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 + 55 254 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 @@ -892,7 +893,7 @@ ICCARM - 55 243 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 + 55 254 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 @@ -915,7 +916,7 @@ ICCARM - 55 243 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 + 55 254 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 @@ -938,7 +939,7 @@ ICCARM - 55 243 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 + 55 254 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 @@ -961,7 +962,7 @@ ICCARM - 55 243 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 + 55 254 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 @@ -984,7 +985,7 @@ ICCARM - 55 243 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 + 55 254 2 1 158 160 145 84 162 142 112 116 182 51 13 6 8 10 12 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47 49 4 53 57 59 62 @@ -993,7 +994,7 @@ BICOMP - 68 + 72 ICCARM @@ -1077,7 +1078,7 @@ OBJCOPY - 69 + 70 diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.elf b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.elf index ef4a1c90..1e49fe6a 100644 Binary files a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.elf and b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.elf differ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.map b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.map index 7c7237af..7fac0575 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.map +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/bin/openbtl_olimex_stm32e407.map @@ -3326,7 +3326,7 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossw .debug_frame 0x000032f0 0x790 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7em_t_le_eabi.a(libdebugio.o) .debug_frame 0x00003a80 0xa0 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7em_t_le_eabi.a(user_libc.o) -.debug_info 0x00000000 0x1000e +.debug_info 0x00000000 0x1000f .debug_info 0x00000000 0x35cb THUMB Debug/../../obj/mmc.o .debug_info 0x000035cb 0x61d THUMB Debug/../../obj/system_stm32f4xx.o .debug_info 0x00003be8 0x8a0 THUMB Debug/../../obj/stm32f4xx_flash.o @@ -3334,29 +3334,29 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossw .debug_info 0x00004c91 0xda0 THUMB Debug/../../obj/stm32f4xx_rcc.o .debug_info 0x00005a31 0x8e0 THUMB Debug/../../obj/stm32f4xx_sdio.o .debug_info 0x00006311 0xc4b THUMB Debug/../../obj/stm32f4xx_usart.o - .debug_info 0x00006f5c 0x837 THUMB Debug/../../obj/hooks.o - .debug_info 0x00007793 0x464 THUMB Debug/../../obj/main.o - .debug_info 0x00007bf7 0x10a THUMB Debug/../../obj/cstart.o - .debug_info 0x00007d01 0x13f THUMB Debug/../../obj/vectors.o - .debug_info 0x00007e40 0x1dd THUMB Debug/../../obj/cpu.o - .debug_info 0x0000801d 0xa0b THUMB Debug/../../obj/flash.o - .debug_info 0x00008a28 0x252 THUMB Debug/../../obj/nvm.o - .debug_info 0x00008c7a 0x195 THUMB Debug/../../obj/timer.o - .debug_info 0x00008e0f 0x65e THUMB Debug/../../obj/uart.o - .debug_info 0x0000946d 0x10a THUMB Debug/../../obj/assert.o - .debug_info 0x00009577 0x15f THUMB Debug/../../obj/backdoor.o - .debug_info 0x000096d6 0x177 THUMB Debug/../../obj/boot.o - .debug_info 0x0000984d 0x2be THUMB Debug/../../obj/com.o - .debug_info 0x00009b0b 0x9a THUMB Debug/../../obj/cop.o - .debug_info 0x00009ba5 0x83a THUMB Debug/../../obj/xcp.o - .debug_info 0x0000a3df 0x3562 THUMB Debug/../../obj/ff.o - .debug_info 0x0000d941 0x169 THUMB Debug/../../obj/unicode.o - .debug_info 0x0000daaa 0x122d THUMB Debug/../../obj/file.o - .debug_info 0x0000ecd7 0xd02 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7em_t_le_eabi.a(libc2.o) - .debug_info 0x0000f9d9 0x55f C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7em_t_le_eabi.a(libdebugio.o) - .debug_info 0x0000ff38 0xd6 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7em_t_le_eabi.a(user_libc.o) + .debug_info 0x00006f5c 0x838 THUMB Debug/../../obj/hooks.o + .debug_info 0x00007794 0x464 THUMB Debug/../../obj/main.o + .debug_info 0x00007bf8 0x10a THUMB Debug/../../obj/cstart.o + .debug_info 0x00007d02 0x13f THUMB Debug/../../obj/vectors.o + .debug_info 0x00007e41 0x1dd THUMB Debug/../../obj/cpu.o + .debug_info 0x0000801e 0xa0b THUMB Debug/../../obj/flash.o + .debug_info 0x00008a29 0x252 THUMB Debug/../../obj/nvm.o + .debug_info 0x00008c7b 0x195 THUMB Debug/../../obj/timer.o + .debug_info 0x00008e10 0x65e THUMB Debug/../../obj/uart.o + .debug_info 0x0000946e 0x10a THUMB Debug/../../obj/assert.o + .debug_info 0x00009578 0x15f THUMB Debug/../../obj/backdoor.o + .debug_info 0x000096d7 0x177 THUMB Debug/../../obj/boot.o + .debug_info 0x0000984e 0x2be THUMB Debug/../../obj/com.o + .debug_info 0x00009b0c 0x9a THUMB Debug/../../obj/cop.o + .debug_info 0x00009ba6 0x83a THUMB Debug/../../obj/xcp.o + .debug_info 0x0000a3e0 0x3562 THUMB Debug/../../obj/ff.o + .debug_info 0x0000d942 0x169 THUMB Debug/../../obj/unicode.o + .debug_info 0x0000daab 0x122d THUMB Debug/../../obj/file.o + .debug_info 0x0000ecd8 0xd02 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7em_t_le_eabi.a(libc2.o) + .debug_info 0x0000f9da 0x55f C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7em_t_le_eabi.a(libdebugio.o) + .debug_info 0x0000ff39 0xd6 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7em_t_le_eabi.a(user_libc.o) -.debug_abbrev 0x00000000 0x27d4 +.debug_abbrev 0x00000000 0x27e3 .debug_abbrev 0x00000000 0x370 THUMB Debug/../../obj/mmc.o .debug_abbrev 0x00000370 0x158 THUMB Debug/../../obj/system_stm32f4xx.o .debug_abbrev 0x000004c8 0x1a9 THUMB Debug/../../obj/stm32f4xx_flash.o @@ -3364,27 +3364,27 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossw .debug_abbrev 0x00000881 0x229 THUMB Debug/../../obj/stm32f4xx_rcc.o .debug_abbrev 0x00000aaa 0x1d9 THUMB Debug/../../obj/stm32f4xx_sdio.o .debug_abbrev 0x00000c83 0x1fc THUMB Debug/../../obj/stm32f4xx_usart.o - .debug_abbrev 0x00000e7f 0x1f9 THUMB Debug/../../obj/hooks.o - .debug_abbrev 0x00001078 0x1b6 THUMB Debug/../../obj/main.o - .debug_abbrev 0x0000122e 0x14 THUMB Debug/../../obj/cstart.o - .debug_abbrev 0x00001242 0xf6 THUMB Debug/../../obj/vectors.o - .debug_abbrev 0x00001338 0xe8 THUMB Debug/../../obj/cpu.o - .debug_abbrev 0x00001420 0x2c7 THUMB Debug/../../obj/flash.o - .debug_abbrev 0x000016e7 0xf8 THUMB Debug/../../obj/nvm.o - .debug_abbrev 0x000017df 0xf8 THUMB Debug/../../obj/timer.o - .debug_abbrev 0x000018d7 0x1fe THUMB Debug/../../obj/uart.o - .debug_abbrev 0x00001ad5 0x9d THUMB Debug/../../obj/assert.o - .debug_abbrev 0x00001b72 0x91 THUMB Debug/../../obj/backdoor.o - .debug_abbrev 0x00001c03 0x62 THUMB Debug/../../obj/boot.o - .debug_abbrev 0x00001c65 0x172 THUMB Debug/../../obj/com.o - .debug_abbrev 0x00001dd7 0x44 THUMB Debug/../../obj/cop.o - .debug_abbrev 0x00001e1b 0x24d THUMB Debug/../../obj/xcp.o - .debug_abbrev 0x00002068 0x337 THUMB Debug/../../obj/ff.o - .debug_abbrev 0x0000239f 0xa8 THUMB Debug/../../obj/unicode.o - .debug_abbrev 0x00002447 0x25c THUMB Debug/../../obj/file.o - .debug_abbrev 0x000026a3 0xcb C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7em_t_le_eabi.a(libc2.o) - .debug_abbrev 0x0000276e 0x3e C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7em_t_le_eabi.a(libdebugio.o) - .debug_abbrev 0x000027ac 0x28 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7em_t_le_eabi.a(user_libc.o) + .debug_abbrev 0x00000e7f 0x208 THUMB Debug/../../obj/hooks.o + .debug_abbrev 0x00001087 0x1b6 THUMB Debug/../../obj/main.o + .debug_abbrev 0x0000123d 0x14 THUMB Debug/../../obj/cstart.o + .debug_abbrev 0x00001251 0xf6 THUMB Debug/../../obj/vectors.o + .debug_abbrev 0x00001347 0xe8 THUMB Debug/../../obj/cpu.o + .debug_abbrev 0x0000142f 0x2c7 THUMB Debug/../../obj/flash.o + .debug_abbrev 0x000016f6 0xf8 THUMB Debug/../../obj/nvm.o + .debug_abbrev 0x000017ee 0xf8 THUMB Debug/../../obj/timer.o + .debug_abbrev 0x000018e6 0x1fe THUMB Debug/../../obj/uart.o + .debug_abbrev 0x00001ae4 0x9d THUMB Debug/../../obj/assert.o + .debug_abbrev 0x00001b81 0x91 THUMB Debug/../../obj/backdoor.o + .debug_abbrev 0x00001c12 0x62 THUMB Debug/../../obj/boot.o + .debug_abbrev 0x00001c74 0x172 THUMB Debug/../../obj/com.o + .debug_abbrev 0x00001de6 0x44 THUMB Debug/../../obj/cop.o + .debug_abbrev 0x00001e2a 0x24d THUMB Debug/../../obj/xcp.o + .debug_abbrev 0x00002077 0x337 THUMB Debug/../../obj/ff.o + .debug_abbrev 0x000023ae 0xa8 THUMB Debug/../../obj/unicode.o + .debug_abbrev 0x00002456 0x25c THUMB Debug/../../obj/file.o + .debug_abbrev 0x000026b2 0xcb C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_v7em_t_le_eabi.a(libc2.o) + .debug_abbrev 0x0000277d 0x3e C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libdebugio_v7em_t_le_eabi.a(libdebugio.o) + .debug_abbrev 0x000027bb 0x28 C:/Program Files (x86)/Rowley Associates Limited/CrossWorks for ARM 2.3/lib/libc_user_libc_v7em_t_le_eabi.a(user_libc.o) .debug_loc 0x00000000 0xeb2d .debug_loc 0x00000000 0x2289 THUMB Debug/../../obj/mmc.o diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/config.h b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/config.h rename to Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/blt_conf.h index f942aba3..af48480c 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/config.h +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\config.h +* \file Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM4_STM32_Olimex_STM32E407_Crossworks * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -164,5 +164,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzp b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzp index 7bc29219..d6fecfb5 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzp +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzp @@ -80,9 +80,9 @@ - + diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzs b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzs index b98f61d2..80916529 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzs +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzs @@ -48,9 +48,9 @@ - - + + @@ -63,8 +63,7 @@ - - + - + diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/header.h b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/header.h index 5e5f8b48..5eb9a804 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/header.h +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f4xx.h" /* STM32 registers */ #include "stm32f4xx_conf.h" /* STM32 peripheral drivers */ #include "boot.h" /* bootloader interface driver */ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/ide/stm32f407_crossworks.hzs b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/ide/stm32f407_crossworks.hzs index 6e6c29b1..aab4cc60 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/ide/stm32f407_crossworks.hzs +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_Crossworks/Prog/ide/stm32f407_crossworks.hzs @@ -50,9 +50,9 @@ - - + + @@ -65,8 +65,8 @@ - - + + diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.elf b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.elf index aee23914..71751e95 100644 Binary files a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.elf and b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.elf differ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.map b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.map index 126fb254..d48c5a88 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.map +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/bin/openbtl_olimex_stm32e407.map @@ -20,25 +20,25 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, DATA 2 .bss 0000181c 20000020 08005d60 0001001c 2**3 ALLOC - 3 .debug_info 0000e4c1 00000000 00000000 0001001c 2**0 + 3 .debug_info 0000e4c2 00000000 00000000 0001001c 2**0 CONTENTS, READONLY, DEBUGGING - 4 .debug_abbrev 000027e9 00000000 00000000 0001e4dd 2**0 + 4 .debug_abbrev 000027f8 00000000 00000000 0001e4de 2**0 CONTENTS, READONLY, DEBUGGING - 5 .debug_loc 0000ac20 00000000 00000000 00020cc6 2**0 + 5 .debug_loc 0000ac20 00000000 00000000 00020cd6 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_aranges 00000be8 00000000 00000000 0002b8e6 2**0 + 6 .debug_aranges 00000be8 00000000 00000000 0002b8f6 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_ranges 00000cb0 00000000 00000000 0002c4ce 2**0 + 7 .debug_ranges 00000cb0 00000000 00000000 0002c4de 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_line 00004696 00000000 00000000 0002d17e 2**0 + 8 .debug_line 00004696 00000000 00000000 0002d18e 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_str 0000380f 00000000 00000000 00031814 2**0 + 9 .debug_str 0000380f 00000000 00000000 00031824 2**0 CONTENTS, READONLY, DEBUGGING - 10 .comment 00000030 00000000 00000000 00035023 2**0 + 10 .comment 00000030 00000000 00000000 00035033 2**0 CONTENTS, READONLY - 11 .ARM.attributes 00000033 00000000 00000000 00035053 2**0 + 11 .ARM.attributes 00000033 00000000 00000000 00035063 2**0 CONTENTS, READONLY - 12 .debug_frame 00001f1c 00000000 00000000 00035088 2**2 + 12 .debug_frame 00001f1c 00000000 00000000 00035098 2**2 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 08000000 l d .text 00000000 .text diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/config.h b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/config.h rename to Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/blt_conf.h index 5e4f4fff..14710f65 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/config.h +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM4_STM32_Olimex_STM32E407_GCC\Boot\config.h +* \file Demo\ARMCM4_STM32_Olimex_STM32E407_GCC\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM4_STM32_Olimex_STM32E407_GCC * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -164,5 +164,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/ide/DemoBoot.project b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/ide/DemoBoot.project index 25294345..da15e695 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/ide/DemoBoot.project +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/ide/DemoBoot.project @@ -101,9 +101,9 @@ - + diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/makefile b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/makefile index 20c8af65..bbd0078e 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/makefile +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Boot/makefile @@ -35,7 +35,7 @@ PROJ_NAME=openbtl_olimex_stm32e407 #| Speficy project source files | #|---------------------------------------------------------------------------------------| PROJ_FILES= \ -config.h \ +blt_conf.h \ hooks.c \ main.c \ ./lib/fatfs/ffconf.h \ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Prog/header.h b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Prog/header.h index e8738542..343341ce 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Prog/header.h +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_GCC/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f4xx.h" /* STM32 registers */ #include "stm32f4xx_conf.h" /* STM32 peripheral drivers */ #include "boot.h" /* bootloader interface driver */ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/bin/openbtl_olimex_stm32e407.out b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/bin/openbtl_olimex_stm32e407.out index 61f91f06..14eefae5 100644 Binary files a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/bin/openbtl_olimex_stm32e407.out and b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/bin/openbtl_olimex_stm32e407.out differ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/config.h b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/blt_conf.h similarity index 96% rename from Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/config.h rename to Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/blt_conf.h index 4fa3c1e0..9937b9a1 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/config.h +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/blt_conf.h @@ -1,5 +1,5 @@ /************************************************************************************//** -* \file Demo\ARMCM4_STM32_Olimex_STM32E407_IAR\Boot\config.h +* \file Demo\ARMCM4_STM32_Olimex_STM32E407_IAR\Boot\blt_conf.h * \brief Bootloader configuration header file. * \ingroup Boot_ARMCM4_STM32_Olimex_STM32E407_IAR * \internal @@ -30,8 +30,8 @@ * * \endinternal ****************************************************************************************/ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef BLT_CONF_H +#define BLT_CONF_H /**************************************************************************************** * C P U D R I V E R C O N F I G U R A T I O N @@ -166,5 +166,5 @@ #define BOOT_COP_HOOKS_ENABLE (0) -#endif /* CONFIG_H */ -/*********************************** end of config.h ***********************************/ +#endif /* BLT_CONF_H */ +/*********************************** end of blt_conf.h *********************************/ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/settings/stm32f407.wsdt b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/settings/stm32f407.wsdt index 438e1b8c..f59ec3d6 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/settings/stm32f407.wsdt +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/settings/stm32f407.wsdt @@ -12,7 +12,7 @@ - 124272727 + 203272727 @@ -30,7 +30,7 @@ - + TabID-10231-8055 @@ -42,7 +42,7 @@ - 0 + 0 TabID-3456-10024 @@ -58,20 +58,20 @@ - 0 + 0 - TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM4_STM32\flash.c000003151940619406TextEditor$WS_DIR$\..\config.h000005754055405TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM4_STM32\nvm.c0000014564796479TextEditor$WS_DIR$\..\lib\fatfs\mmc.c000005972781627816TextEditor$WS_DIR$\..\..\..\..\Source\fatfs\src\ff.c000003114111111111111TextEditor$WS_DIR$\..\..\..\..\Source\xcp.c000002161156011560TextEditor$WS_DIR$\..\..\..\..\Source\boot.c000003327982798TextEditor$WS_DIR$\..\..\..\..\Source\backdoor.c000008957995799TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM4_STM32\cpu.c000009152115211TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM4_STM32\timer.c000006341864186TextEditor$WS_DIR$\..\..\..\..\Source\file.c0000010859936018TextEditor$WS_DIR$\..\..\..\..\Source\ARMCM4_STM32\uart.c0000014474897489TextEditor$WS_DIR$\..\..\..\..\Source\com.c0000013370857085TextEditor$WS_DIR$\..\hooks.c000003311625316253TextEditor$WS_DIR$\..\main.c000003329002900140100000010000001 + TextEditor$WS_DIR$\..\main.c0000000000100000010000001 - iaridepm.enu1-2-2529215-2-2105114104167198606215278925087-2-2529291-2-210101141001984198606290675925087 + iaridepm.enu1-2-2778277-2-2135163104328198056215611947752-2-2778374-2-212971631002318198056290572947752 diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.dep b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.dep index 2cbd1e45..248481a4 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.dep +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.dep @@ -2,7 +2,7 @@ 2 - 321377065 + 3754409461 Debug @@ -76,7 +76,7 @@ $PROJ_DIR$\..\config.h $PROJ_DIR$\..\hooks.c $PROJ_DIR$\..\main.c - $PROJ_DIR$\..\obj\stm32f4xx_usart.pbi + $TOOLKIT_DIR$\inc\c\string.h $PROJ_DIR$\..\..\..\..\Source\ARMCM4_STM32\IAR\cstart.s $PROJ_DIR$\..\..\..\..\Source\ARMCM4_STM32\IAR\vectors.c $PROJ_DIR$\..\..\..\..\Source\ARMCM4_STM32\cpu.c @@ -110,17 +110,17 @@ $PROJ_DIR$\..\..\..\..\Source\plausibility.h $PROJ_DIR$\..\..\..\..\Source\xcp.c $PROJ_DIR$\..\..\..\..\Source\xcp.h - $TOOLKIT_DIR$\inc\c\DLib_Threads.h + $PROJ_DIR$\..\obj\stm32f4xx_usart.pbi $PROJ_DIR$\..\obj\uart.pbi - $PROJ_DIR$\..\obj\stm32f4xx_pwr.o - $PROJ_DIR$\..\obj\stm32f4xx_rcc.pbi - $PROJ_DIR$\..\obj\stm32f4xx_pwr.pbi + $TOOLKIT_DIR$\inc\c\DLib_Threads.h $PROJ_DIR$\..\obj\stm32f4xx_sdio.pbi - $PROJ_DIR$\..\bin\openbtl_olimex_stm32e407.srec $PROJ_DIR$\..\obj\stm32f4xx_wwdg.pbi + $PROJ_DIR$\..\bin\openbtl_olimex_stm32e407.srec + $PROJ_DIR$\..\obj\stm32f4xx_pwr.pbi $TOOLKIT_DIR$\inc\c\cmsis_iar.h + $PROJ_DIR$\..\obj\stm32f4xx_rcc.pbi + $PROJ_DIR$\..\obj\stm32f4xx_pwr.o $TOOLKIT_DIR$\inc\c\DLib_Product_string.h - $TOOLKIT_DIR$\inc\c\string.h $PROJ_DIR$\..\obj\stm32f4xx_tim.o $PROJ_DIR$\..\obj\stm32f4xx_usart.o $PROJ_DIR$\..\obj\stm32f4xx_wwdg.o @@ -226,8 +226,8 @@ $PROJ_DIR$\..\obj\stm32f4xx_can.lst $PROJ_DIR$\..\obj\stm32f4xx_cryp_des.lst $TOOLKIT_DIR$\lib\shb_l.a - $PROJ_DIR$\..\..\..\..\Source\ARMCM4_STM32\IAR\memory.x $PROJ_DIR$\..\obj\misc.lst + $PROJ_DIR$\..\..\..\..\Source\ARMCM4_STM32\IAR\memory.x $PROJ_DIR$\..\obj\stm32f4xx_syscfg.pbi $PROJ_DIR$\..\obj\stm32f4xx_hash_sha1.pbi $PROJ_DIR$\..\obj\stm32f4xx_cryp.lst @@ -279,8 +279,8 @@ $PROJ_DIR$\..\obj\stm32f4xx_spi.pbi $PROJ_DIR$\..\obj\stm32f4xx_rtc.pbi $PROJ_DIR$\..\obj\stm32f4xx_i2c.o - $PROJ_DIR$\..\..\..\..\Source\fatfs\src\option\ccsbcs.c $PROJ_DIR$\..\obj\stm32f4xx_syscfg.o + $PROJ_DIR$\..\..\..\..\Source\fatfs\src\option\ccsbcs.c $PROJ_DIR$\..\obj\stm32f4xx_cryp_des.pbi $PROJ_DIR$\..\obj\stm32f4xx_cryp.pbi $PROJ_DIR$\..\obj\stm32f4xx_iwdg.o @@ -292,6 +292,7 @@ $PROJ_DIR$\..\obj\stm32f4xx_sdio.o $PROJ_DIR$\..\obj\stm32f4xx_cryp_tdes.pbi $PROJ_DIR$\..\obj\stm32f4xx_spi.o + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\lib\fatfs\mmc.c @@ -308,11 +309,11 @@ BICOMP - 114 125 151 121 136 126 152 104 130 113 85 88 8 4 122 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 70 125 151 121 136 126 152 106 130 114 85 88 8 4 122 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 114 125 151 121 136 126 152 104 130 113 85 88 8 4 122 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 70 125 151 121 136 126 152 106 130 114 85 88 8 4 122 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -325,17 +326,17 @@ ICCARM - 221 135 + 220 135 BICOMP - 7 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 + 7 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 ICCARM - 7 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 + 7 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 @@ -354,7 +355,7 @@ ICCARM - 10 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 10 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -373,11 +374,11 @@ BICOMP - 12 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 12 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 12 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 12 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -396,11 +397,11 @@ BICOMP - 15 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 15 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 15 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 15 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -419,11 +420,11 @@ BICOMP - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -442,11 +443,11 @@ BICOMP - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -465,11 +466,11 @@ BICOMP - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -488,11 +489,11 @@ BICOMP - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 17 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 17 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -520,11 +521,11 @@ BICOMP - 22 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 22 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 22 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 22 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -543,11 +544,11 @@ BICOMP - 24 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 24 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 24 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 24 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -566,11 +567,11 @@ BICOMP - 26 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 26 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 26 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 26 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -589,11 +590,11 @@ BICOMP - 28 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 28 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 28 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 28 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -612,11 +613,11 @@ BICOMP - 30 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 30 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 30 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 30 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -635,11 +636,11 @@ BICOMP - 32 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 32 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 32 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 32 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -658,11 +659,11 @@ BICOMP - 34 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 34 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 34 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 34 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -681,11 +682,11 @@ BICOMP - 36 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 42 44 46 48 50 52 54 56 58 60 62 64 7 + 36 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 36 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 42 44 46 48 50 52 54 56 58 60 62 64 7 + 36 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -704,11 +705,11 @@ BICOMP - 38 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 38 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 38 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 38 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -727,11 +728,11 @@ BICOMP - 38 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 38 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 38 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 38 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -750,11 +751,11 @@ BICOMP - 38 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 38 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 38 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 38 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -773,11 +774,11 @@ BICOMP - 42 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 44 46 48 50 52 54 56 58 60 62 64 7 + 42 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 42 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 44 46 48 50 52 54 56 58 60 62 64 7 + 42 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 44 46 48 50 52 54 56 58 60 62 64 7 @@ -796,11 +797,11 @@ BICOMP - 44 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 46 48 50 52 54 56 58 60 62 64 7 + 44 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 44 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 46 48 50 52 54 56 58 60 62 64 7 + 44 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 46 48 50 52 54 56 58 60 62 64 7 @@ -809,21 +810,21 @@ BICOMP - 108 + 110 ICCARM - 248 106 + 248 113 BICOMP - 46 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 48 50 52 54 56 58 60 62 64 7 + 46 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 48 50 52 54 56 58 60 62 64 7 ICCARM - 46 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 48 50 52 54 56 58 60 62 64 7 + 46 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 48 50 52 54 56 58 60 62 64 7 @@ -832,7 +833,7 @@ BICOMP - 107 + 112 ICCARM @@ -842,11 +843,11 @@ BICOMP - 48 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 50 52 54 56 58 60 62 64 7 + 48 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 50 52 54 56 58 60 62 64 7 ICCARM - 48 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 50 52 54 56 58 60 62 64 7 + 48 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 50 52 54 56 58 60 62 64 7 @@ -865,11 +866,11 @@ BICOMP - 50 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 52 54 56 58 60 62 64 7 + 50 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 52 54 56 58 60 62 64 7 ICCARM - 50 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 52 54 56 58 60 62 64 7 + 50 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 52 54 56 58 60 62 64 7 @@ -888,11 +889,11 @@ BICOMP - 52 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 54 56 58 60 62 64 7 + 52 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 54 56 58 60 62 64 7 ICCARM - 52 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 54 56 58 60 62 64 7 + 52 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 54 56 58 60 62 64 7 @@ -901,7 +902,7 @@ BICOMP - 109 + 107 ICCARM @@ -911,11 +912,11 @@ BICOMP - 54 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 56 58 60 62 64 7 + 54 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 56 58 60 62 64 7 ICCARM - 54 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 56 58 60 62 64 7 + 54 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 56 58 60 62 64 7 @@ -934,11 +935,11 @@ BICOMP - 56 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 58 60 62 64 7 + 56 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 58 60 62 64 7 ICCARM - 56 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 58 60 62 64 7 + 56 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 58 60 62 64 7 @@ -951,17 +952,17 @@ ICCARM - 245 274 + 245 273 BICOMP - 58 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 60 62 64 7 + 58 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 60 62 64 7 ICCARM - 58 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 60 62 64 7 + 58 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 60 62 64 7 @@ -980,11 +981,11 @@ BICOMP - 60 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 62 64 7 + 60 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 62 64 7 ICCARM - 60 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 62 64 7 + 60 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 62 64 7 @@ -993,7 +994,7 @@ BICOMP - 70 + 104 ICCARM @@ -1003,11 +1004,11 @@ BICOMP - 62 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 64 7 + 62 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 64 7 ICCARM - 62 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 64 7 + 62 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 64 7 @@ -1016,7 +1017,7 @@ BICOMP - 111 + 108 ICCARM @@ -1026,11 +1027,11 @@ BICOMP - 64 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 7 + 64 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 7 ICCARM - 64 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 7 + 64 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 7 @@ -1049,11 +1050,11 @@ BICOMP - 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -1072,11 +1073,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -1095,11 +1096,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -1127,11 +1128,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1150,11 +1151,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1173,11 +1174,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -1196,11 +1197,11 @@ BICOMP - 86 88 2 85 260 125 151 121 136 126 152 104 + 86 88 2 85 260 125 151 121 136 126 152 106 ICCARM - 86 88 2 85 260 125 151 121 136 126 152 104 + 86 88 2 85 260 125 151 121 136 126 152 106 @@ -1219,11 +1220,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1242,11 +1243,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -1265,11 +1266,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 104 1 112 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 8 4 122 125 151 121 136 126 152 106 1 111 134 5 3 66 13 10 12 15 17 22 24 26 28 30 32 34 38 36 42 44 46 48 50 52 54 56 58 60 62 64 7 @@ -1288,11 +1289,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1311,11 +1312,11 @@ BICOMP - 86 88 2 273 + 86 88 2 274 ICCARM - 86 88 2 273 + 86 88 2 274 @@ -1334,11 +1335,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1357,11 +1358,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1380,11 +1381,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 84 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 84 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 84 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 84 @@ -1403,11 +1404,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1426,11 +1427,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 114 125 151 121 136 126 152 104 130 113 207 205 204 179 183 201 200 202 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 70 125 151 121 136 126 152 106 130 114 207 205 204 179 183 201 200 202 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 114 125 151 121 136 126 152 104 130 113 207 205 204 179 183 201 200 202 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 70 125 151 121 136 126 152 106 130 114 207 205 204 179 183 201 200 202 @@ -1449,11 +1450,11 @@ BICOMP - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 ICCARM - 94 82 90 67 101 74 98 79 76 81 92 100 86 88 2 96 103 + 94 82 90 286 101 74 98 79 76 81 92 100 86 88 2 96 103 @@ -1466,13 +1467,13 @@ OBJCOPY - 110 + 109 ILINK - 220 131 164 165 168 191 182 187 264 192 189 167 166 135 261 206 143 145 149 146 138 139 142 153 144 154 155 156 157 158 159 160 147 148 272 277 106 279 281 282 283 285 274 115 116 117 140 193 236 265 199 195 219 251 253 244 + 221 131 164 165 168 191 182 187 264 192 189 167 166 135 261 206 143 145 149 146 138 139 142 153 144 154 155 156 157 158 159 160 147 148 272 277 113 279 281 282 283 285 273 115 116 117 140 193 236 265 199 195 219 251 253 244 diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.ewp b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.ewp index 738cd183..ac861f8b 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.ewp +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Boot/ide/stm32f407.ewp @@ -2057,7 +2057,7 @@ - $PROJ_DIR$\..\config.h + $PROJ_DIR$\..\blt_conf.h $PROJ_DIR$\..\hooks.c diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/bin/demoprog_olimex_stm32e407.out b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/bin/demoprog_olimex_stm32e407.out index 84d2f195..81800f58 100644 Binary files a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/bin/demoprog_olimex_stm32e407.out and b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/bin/demoprog_olimex_stm32e407.out differ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/header.h b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/header.h index a0808014..2754da10 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/header.h +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/header.h @@ -36,7 +36,7 @@ /**************************************************************************************** * Include files ****************************************************************************************/ -#include "../Boot/config.h" /* bootloader configuration */ +#include "../Boot/blt_conf.h" /* bootloader configuration */ #include "stm32f4xx.h" /* STM32 registers */ #include "stm32f4xx_conf.h" /* STM32 peripheral drivers */ #include "boot.h" /* bootloader interface driver */ diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/settings/stm32f407.wsdt b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/settings/stm32f407.wsdt index 29d871c9..3b0ed735 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/settings/stm32f407.wsdt +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/settings/stm32f407.wsdt @@ -12,12 +12,12 @@ - 124272727 + 181272727 20139537293 - + TabID-29163-19963 @@ -29,7 +29,7 @@ - 0TabID-19063-20767BuildBuild0 + 0TabID-19063-20767BuildBuild0 @@ -42,7 +42,7 @@ - iaridepm.enu1-2-2417198-2-2105114104167198606198413729965-2-21121010-2-210121141003968198606104167198606 + iaridepm.enu1-2-2617255-2-2135163104328198056198609752126-2-21611296-2-212981631003091198056104328198056 diff --git a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/stm32f407.dep b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/stm32f407.dep index 7b94bb24..d1b6c1ce 100644 --- a/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/stm32f407.dep +++ b/Target/Demo/ARMCM4_STM32_Olimex_STM32E407_IAR/Prog/ide/stm32f407.dep @@ -218,6 +218,7 @@ $TOOLKIT_DIR$\inc\c\stdint.h $PROJ_DIR$\..\obj\stm32f4xx_can.pbi $PROJ_DIR$\..\obj\stm32f4xx_crc.pbi + $PROJ_DIR$\..\..\Boot\blt_conf.h $PROJ_DIR$\..\lib\stdperiphlib\STM32F4xx_StdPeriph_Driver\src\misc.c @@ -979,7 +980,7 @@ ICCARM - 68 174 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 + 68 212 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 @@ -1011,7 +1012,7 @@ ICCARM - 68 174 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 + 68 212 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 @@ -1030,7 +1031,7 @@ ICCARM - 68 174 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 + 68 212 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 @@ -1053,7 +1054,7 @@ ICCARM - 68 174 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 + 68 212 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 @@ -1076,7 +1077,7 @@ ICCARM - 68 174 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 + 68 212 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 @@ -1099,7 +1100,7 @@ ICCARM - 68 174 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 + 68 212 6 0 209 193 132 198 186 192 133 79 3 84 208 4 2 64 11 8 10 13 15 20 22 24 26 28 30 32 36 34 40 42 44 46 48 50 52 54 56 58 60 62 5 66 70 72 75 diff --git a/Target/Source/boot.h b/Target/Source/boot.h index 8cc83c07..3606af30 100644 --- a/Target/Source/boot.h +++ b/Target/Source/boot.h @@ -33,12 +33,33 @@ #ifndef BOOT_H #define BOOT_H +/**************************************************************************************** +* Defines +****************************************************************************************/ +/** \brief Main version of the bootloader core. */ +#define BOOT_VERSION_CORE_MAIN (0u) +/** \brief Minor version of the bootloader core. */ +#define BOOT_VERSION_CORE_MINOR (96u) +/** \brief Bufgix version of the bootloader core. */ +#define BOOT_VERSION_CORE_BUGFIX (0u) + + /**************************************************************************************** * Include files ****************************************************************************************/ +/* Note that it is possible to override the standard blt_conf.h configuration header + * file with a project specific one that is defined in the IDE/makefile. For example, + * the following define could be configured: PROJ_BLT_CONF_H="my_boot_config.h". This can + * be handy if you use the bootloader in several projects with a different configuration, + * and enables you to have just one bootloader source base. + */ #include "types.h" /* variable types */ #include "assert.h" /* assertion checks */ -#include "config.h" /* bootloader configuration */ +#ifdef PROJ_BLT_CONF_H +#include PROJ_BLT_CONF_H /* custom configuration */ +#else +#include "blt_conf.h" /* bootloader configuration */ +#endif /* PROJ_BLT_CONF_H */ #include "plausibility.h" /* plausibility checks */ #include "cpu.h" /* cpu driver module */ #include "cop.h" /* watchdog driver module */ @@ -50,17 +71,6 @@ #include "xcp.h" /* xcp communication layer */ -/**************************************************************************************** -* Defines -****************************************************************************************/ -/** \brief Main version of the bootloader core. */ -#define BOOT_VERSION_CORE_MAIN (0u) -/** \brief Minor version of the bootloader core. */ -#define BOOT_VERSION_CORE_MINOR (96u) -/** \brief Bufgix version of the bootloader core. */ -#define BOOT_VERSION_CORE_BUGFIX (0u) - - /**************************************************************************************** * Function prototypes ****************************************************************************************/ diff --git a/Target/Source/plausibility.h b/Target/Source/plausibility.h index e5735bed..fb6eb46d 100644 --- a/Target/Source/plausibility.h +++ b/Target/Source/plausibility.h @@ -38,7 +38,7 @@ * C P U D R I V E R C O N F I G U R A T I O N C H E C K ****************************************************************************************/ #ifndef BOOT_CPU_XTAL_SPEED_KHZ -#error "BOOT_CPU_XTAL_SPEED_KHZ is missing in config.h" +#error "BOOT_CPU_XTAL_SPEED_KHZ is missing in blt_conf.h" #endif #if (BOOT_CPU_XTAL_SPEED_KHZ <= 0) @@ -46,7 +46,7 @@ #endif #ifndef BOOT_CPU_SYSTEM_SPEED_KHZ -#error "BOOT_CPU_SYSTEM_SPEED_KHZ is missing in config.h" +#error "BOOT_CPU_SYSTEM_SPEED_KHZ is missing in blt_conf.h" #endif #if (BOOT_CPU_SYSTEM_SPEED_KHZ <= 0) @@ -54,7 +54,7 @@ #endif #ifndef BOOT_CPU_BYTE_ORDER_MOTOROLA -#error "BOOT_CPU_BYTE_ORDER_MOTOROLA is missing in config.h" +#error "BOOT_CPU_BYTE_ORDER_MOTOROLA is missing in blt_conf.h" #endif #if (BOOT_CPU_BYTE_ORDER_MOTOROLA < 0) || (BOOT_CPU_BYTE_ORDER_MOTOROLA > 1) @@ -79,7 +79,7 @@ #if (BOOT_COM_CAN_ENABLE > 0) #ifndef BOOT_COM_CAN_BAUDRATE - #error "BOOT_COM_CAN_BAUDRATE is missing in config.h" + #error "BOOT_COM_CAN_BAUDRATE is missing in blt_conf.h" #endif #if (BOOT_COM_CAN_BAUDRATE <= 0) @@ -87,7 +87,7 @@ #endif #ifndef BOOT_COM_CAN_TX_MSG_ID - #error "BOOT_COM_CAN_TX_MSG_ID is missing in config.h" + #error "BOOT_COM_CAN_TX_MSG_ID is missing in blt_conf.h" #endif #if (BOOT_COM_CAN_TX_MSG_ID <= 0) @@ -95,7 +95,7 @@ #endif #ifndef BOOT_COM_CAN_TX_MAX_DATA - #error "BOOT_COM_CAN_TX_MAX_DATA is missing in config.h" + #error "BOOT_COM_CAN_TX_MAX_DATA is missing in blt_conf.h" #endif #if (BOOT_COM_CAN_TX_MAX_DATA <= 0) @@ -107,7 +107,7 @@ #endif #ifndef BOOT_COM_CAN_RX_MSG_ID - #error "BOOT_COM_CAN_RX_MSG_ID is missing in config.h" + #error "BOOT_COM_CAN_RX_MSG_ID is missing in blt_conf.h" #endif #if (BOOT_COM_CAN_RX_MSG_ID <= 0) @@ -115,7 +115,7 @@ #endif #ifndef BOOT_COM_CAN_RX_MAX_DATA - #error "BOOT_COM_CAN_RX_MAX_DATA is missing in config.h" + #error "BOOT_COM_CAN_RX_MAX_DATA is missing in blt_conf.h" #endif #if (BOOT_COM_CAN_RX_MAX_DATA <= 0) @@ -127,7 +127,7 @@ #endif #ifndef BOOT_COM_CAN_CHANNEL_INDEX - #error "BOOT_COM_CAN_CHANNEL_INDEX is missing in config.h" + #error "BOOT_COM_CAN_CHANNEL_INDEX is missing in blt_conf.h" #endif #if (BOOT_COM_CAN_CHANNEL_INDEX < 0) @@ -141,7 +141,7 @@ #if (BOOT_COM_UART_ENABLE > 0) #ifndef BOOT_COM_UART_BAUDRATE - #error "BOOT_COM_UART_BAUDRATE is missing in config.h" + #error "BOOT_COM_UART_BAUDRATE is missing in blt_conf.h" #endif #if (BOOT_COM_UART_BAUDRATE <= 0) @@ -149,7 +149,7 @@ #endif #ifndef BOOT_COM_UART_TX_MAX_DATA - #error "BOOT_COM_UART_TX_MAX_DATA is missing in config.h" + #error "BOOT_COM_UART_TX_MAX_DATA is missing in blt_conf.h" #endif #if (BOOT_COM_UART_TX_MAX_DATA <= 0) @@ -161,7 +161,7 @@ #endif #ifndef BOOT_COM_UART_RX_MAX_DATA - #error "BOOT_COM_UART_RX_MAX_DATA is missing in config.h" + #error "BOOT_COM_UART_RX_MAX_DATA is missing in blt_conf.h" #endif #if (BOOT_COM_UART_RX_MAX_DATA <= 0) @@ -173,7 +173,7 @@ #endif #ifndef BOOT_COM_UART_CHANNEL_INDEX - #error "BOOT_COM_UART_CHANNEL_INDEX is missing in config.h" + #error "BOOT_COM_UART_CHANNEL_INDEX is missing in blt_conf.h" #endif #if (BOOT_COM_UART_CHANNEL_INDEX < 0) @@ -183,7 +183,7 @@ #if (BOOT_COM_USB_ENABLE > 0) #ifndef BOOT_COM_USB_TX_MAX_DATA - #error "BOOT_COM_USB_TX_MAX_DATA is missing in config.h" + #error "BOOT_COM_USB_TX_MAX_DATA is missing in blt_conf.h" #endif #if (BOOT_COM_USB_TX_MAX_DATA <= 0) @@ -191,7 +191,7 @@ #endif #ifndef BOOT_COM_USB_RX_MAX_DATA - #error "BOOT_COM_USB_RX_MAX_DATA is missing in config.h" + #error "BOOT_COM_USB_RX_MAX_DATA is missing in blt_conf.h" #endif #if (BOOT_COM_USB_RX_MAX_DATA <= 0) @@ -246,12 +246,12 @@ #if (BOOT_COM_CAN_ENABLE == 0) && \ (BOOT_COM_UART_ENABLE == 0) && \ (BOOT_COM_USB_ENABLE == 0) - #error "If not booting from file system (BOOT_FILE_SYS_ENABLE) then a communication interface must be enabled (BOOT_COM_XXX_ENABLE) in config.h" + #error "If not booting from file system (BOOT_FILE_SYS_ENABLE) then a communication interface must be enabled (BOOT_COM_XXX_ENABLE) in blt_conf.h" #endif #endif /* BOOT_FILE_SYS_ENABLE == 0 */ #if ((BOOT_COM_CAN_ENABLE + BOOT_COM_UART_ENABLE + BOOT_COM_USB_ENABLE) > 1) -#error "Too many communication interfaces enabled (BOOT_COM_XXX_ENABLE) in config.h" +#error "Too many communication interfaces enabled (BOOT_COM_XXX_ENABLE) in blt_conf.h" #endif #if (BOOT_COM_CAN_ENABLE == 1) || (BOOT_COM_UART_ENABLE == 1) || (BOOT_COM_USB_ENABLE == 1) @@ -285,7 +285,7 @@ #endif #ifndef BOOT_NVM_SIZE_KB -#error "BOOT_NVM_SIZE_KB is missing in config.h" +#error "BOOT_NVM_SIZE_KB is missing in blt_conf.h" #endif #if (BOOT_NVM_SIZE_KB <= 0)