Refs #120. Updated version number and ran Astyle in preparation for release with STM32F2xx support.
git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@147 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
parent
6a6d2555a4
commit
6b909aa3d7
|
@ -97,7 +97,7 @@ void CpuStartUserProgram(void)
|
|||
RCC_APB2PeriphClockCmd(RCC_APB2Periph_SYSCFG, ENABLE);
|
||||
/* copy user program vector's to RAM */
|
||||
CpuMemCopy(CPU_USER_PROGRAM_RAM_BASEADDR, CPU_USER_PROGRAM_VECTABLE_OFFSET,
|
||||
CPU_USER_PROGRAM_VECTABLE_SIZE);
|
||||
CPU_USER_PROGRAM_VECTABLE_SIZE);
|
||||
/* remap RAM so that it also appears at address 0x00000000. this way the user program's
|
||||
* vector table in RAM is used instead of the bootloader's vector table in flash.
|
||||
*/
|
||||
|
|
|
@ -596,7 +596,7 @@ static blt_bool FlashWriteBlock(tFlashBlockInfo *block)
|
|||
break;
|
||||
}
|
||||
/* verify that the written data is actually there */
|
||||
if (*(volatile blt_int32u*)prog_addr != prog_data)
|
||||
if (*(volatile blt_int32u *)prog_addr != prog_data)
|
||||
{
|
||||
result = BLT_FALSE;
|
||||
break;
|
||||
|
@ -636,7 +636,7 @@ static blt_bool FlashEraseSectors(blt_int8u first_sector, blt_int8u last_sector)
|
|||
/* unlock the flash array */
|
||||
FLASH_Unlock();
|
||||
/* clear pending flags (if any) */
|
||||
FLASH_ClearFlag( FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR );
|
||||
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR);
|
||||
/* check that the flash peripheral is not busy */
|
||||
if (FLASH_GetStatus() == FLASH_BUSY)
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
/** \brief Minor version of the bootloader core. */
|
||||
#define BOOT_VERSION_CORE_MINOR (2u)
|
||||
/** \brief Bufgix version of the bootloader core. */
|
||||
#define BOOT_VERSION_CORE_BUGFIX (1u)
|
||||
#define BOOT_VERSION_CORE_BUGFIX (2u)
|
||||
|
||||
|
||||
/****************************************************************************************
|
||||
|
|
Loading…
Reference in New Issue