diff --git a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.elf b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.elf
index cf53a13c..d80461ad 100644
Binary files a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.elf and b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.elf differ
diff --git a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.srec b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.srec
index 07d2cf08..d81c1f62 100644
--- a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.srec
+++ b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/bin/openblt_stm32f207.srec
@@ -50,7 +50,7 @@ S315080002F070B50E4B93F82432012B02D10B4803F04C
 S3150800030067FE01F005FC00F16406094D402403E090
 S3150800031001F0FEFB864205D32846214600F032FF4F
 S315080003200028F5D0034803F04DFF70BDA00000205B
-S31508000330004400409047000808B5044B93F824325F
+S31508000330004800409047000808B5044B93F824325B
 S31508000340012B02D1014803F043FE08BDA00000209E
 S3150800035070B50646104B93F82432012B0AD10E4984
 S3150800036003F0CEFF002805DA0B48002380F8243274
diff --git a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/hooks.c b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/hooks.c
index 218b3c7e..f14bc31a 100644
--- a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/hooks.c
+++ b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/hooks.c
@@ -348,7 +348,7 @@ void FileFirmwareUpdateCompletedHook(void)
    * 100ms.
    */
   timeoutTime = TimerGet() + 100;
-  while(USART_GetFlagStatus(USART2, USART_FLAG_TC) == RESET)
+  while(USART_GetFlagStatus(USART3, USART_FLAG_TC) == RESET)
   {
     /* check for timeout */
     if (TimerGet() > timeoutTime)
diff --git a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.depend b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.depend
index c80a0cdb..3bc17eba 100644
--- a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.depend
+++ b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.depend
@@ -811,12 +811,12 @@
 
 1469267887 source:c:\work\software\openblt\target\source\armcm3_stm32f2\gcc\cstart.s
 
-1469286972 source:c:\work\software\openblt\target\demo\armcm3_stm32f2_olimex_stm32p207_gcc\boot\hooks.c
+1469648505 source:c:\work\software\openblt\target\demo\armcm3_stm32f2_olimex_stm32p207_gcc\boot\hooks.c
 	"boot.h"
 	"led.h"
 	"stm32f2xx.h"
 
-1462056522 c:\work\software\openblt\target\source\boot.h
+1469435448 c:\work\software\openblt\target\source\boot.h
 	"types.h"
 	"assert.h"
 	"blt_conf.h"
@@ -831,80 +831,80 @@
 
 1469284395 c:\work\software\openblt\target\source\armcm3_stm32f2\types.h
 
-1462050329 c:\work\software\openblt\target\source\assert.h
+1469435361 c:\work\software\openblt\target\source\assert.h
 
 1469290552 c:\work\software\openblt\target\demo\armcm3_stm32f2_olimex_stm32p207_gcc\boot\\blt_conf.h
 
-1469095224 c:\work\software\openblt\target\source\plausibility.h
+1469435361 c:\work\software\openblt\target\source\plausibility.h
 
-1462050415 c:\work\software\openblt\target\source\cpu.h
+1469435361 c:\work\software\openblt\target\source\cpu.h
 
-1462050398 c:\work\software\openblt\target\source\cop.h
+1469435361 c:\work\software\openblt\target\source\cop.h
 
-1462050452 c:\work\software\openblt\target\source\nvm.h
+1469435361 c:\work\software\openblt\target\source\nvm.h
 
-1462050500 c:\work\software\openblt\target\source\timer.h
+1469435361 c:\work\software\openblt\target\source\timer.h
 
-1462050347 c:\work\software\openblt\target\source\backdoor.h
+1469435361 c:\work\software\openblt\target\source\backdoor.h
 
-1462050429 c:\work\software\openblt\target\source\file.h
+1469435361 c:\work\software\openblt\target\source\file.h
 	"ff.h"
 
-1462050383 c:\work\software\openblt\target\source\com.h
+1469435361 c:\work\software\openblt\target\source\com.h
 	"xcp.h"
 
-1462050540 c:\work\software\openblt\target\source\xcp.h
+1469435361 c:\work\software\openblt\target\source\xcp.h
 
-1469268507 source:c:\work\software\openblt\target\source\armcm3_stm32f2\cpu.c
+1469435358 source:c:\work\software\openblt\target\source\armcm3_stm32f2\cpu.c
 	"boot.h"
 
 1469271534 source:c:\work\software\openblt\target\source\armcm3_stm32f2\flash.c
 	"boot.h"
 	"stm32f2xx.h"
 
-1469268776 source:c:\work\software\openblt\target\source\armcm3_stm32f2\nvm.c
+1469435358 source:c:\work\software\openblt\target\source\armcm3_stm32f2\nvm.c
 	"boot.h"
 	"flash.h"
 
-1469268835 c:\work\software\openblt\target\source\armcm3_stm32f2\flash.h
+1469435361 c:\work\software\openblt\target\source\armcm3_stm32f2\flash.h
 
 1469290821 source:c:\work\software\openblt\target\demo\armcm3_stm32f2_olimex_stm32p207_gcc\boot\main.c
 	"boot.h"
 	"stm32f2xx.h"
 
-1469270030 source:c:\work\software\openblt\target\source\armcm3_stm32f2\timer.c
+1469435358 source:c:\work\software\openblt\target\source\armcm3_stm32f2\timer.c
 	"boot.h"
 	"stm32f2xx.h"
 
-1469270039 source:c:\work\software\openblt\target\source\armcm3_stm32f2\uart.c
+1469435358 source:c:\work\software\openblt\target\source\armcm3_stm32f2\uart.c
 	"boot.h"
 	"stm32f2xx.h"
 
-1462050298 source:c:\work\software\openblt\target\source\assert.c
+1469435356 source:c:\work\software\openblt\target\source\assert.c
 	"boot.h"
 
-1462050338 source:c:\work\software\openblt\target\source\backdoor.c
+1469435356 source:c:\work\software\openblt\target\source\backdoor.c
 	"boot.h"
 
-1462050354 source:c:\work\software\openblt\target\source\boot.c
+1469435356 source:c:\work\software\openblt\target\source\boot.c
 	"boot.h"
 
-1462050377 source:c:\work\software\openblt\target\source\com.c
+1469435356 source:c:\work\software\openblt\target\source\com.c
 	"boot.h"
 	"can.h"
 	"uart.h"
 	"usb.h"
 	"net.h"
 
-1462050370 c:\work\software\openblt\target\source\can.h
+1469435361 c:\work\software\openblt\target\source\can.h
 
-1462050513 c:\work\software\openblt\target\source\uart.h
+1469435361 c:\work\software\openblt\target\source\uart.h
 
-1462050525 c:\work\software\openblt\target\source\usb.h
+1469435361 c:\work\software\openblt\target\source\usb.h
 
-1462050443 c:\work\software\openblt\target\source\net.h
+1469435361 c:\work\software\openblt\target\source\net.h
 
-1462050390 source:c:\work\software\openblt\target\source\cop.c
+1469435356 source:c:\work\software\openblt\target\source\cop.c
 	"boot.h"
 
 1469284606 source:c:\work\software\openblt\target\source\file.c
@@ -912,7 +912,7 @@
 	<string.h>
 	<ctype.h>
 
-1462050533 source:c:\work\software\openblt\target\source\xcp.c
+1469435357 source:c:\work\software\openblt\target\source\xcp.c
 	"boot.h"
 
 1456845507 c:\work\software\openblt\target\source\third_party\fatfs\src\ff.h
diff --git a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.elay b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.elay
index 82da1829..8da22fa5 100644
--- a/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.elay
+++ b/Target/Demo/ARMCM3_STM32F2_Olimex_STM32P207_GCC/Boot/ide/stm32f207.elay
@@ -6,9 +6,9 @@
 			<Cursor1 position="4969" topLine="51" />
 		</Cursor>
 	</File>
-	<File name="..\hooks.c" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\hooks.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="16362" topLine="313" />
+			<Cursor1 position="15904" topLine="320" />
 		</Cursor>
 	</File>
 	<File name="..\led.c" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -31,9 +31,9 @@
 			<Cursor1 position="49972" topLine="1239" />
 		</Cursor>
 	</File>
-	<File name="..\main.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\main.c" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2697" topLine="41" />
+			<Cursor1 position="5879" topLine="95" />
 		</Cursor>
 	</File>
 	<File name="..\..\..\..\Source\ARMCM3_STM32F2\can.c" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">