diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.elf b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.elf
index a1f0208e..64931d82 100644
Binary files a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.elf and b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.elf differ
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.map b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.map
index 4b3a43c7..904fbcfb 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.map
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/bin/openblt_olimex_lpc_l2294_20mhz.map
@@ -196,11 +196,11 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, READONLY, DEBUGGING
78 .debug_macro 00001d6a 00000000 00000000 00024db0 2**0
CONTENTS, READONLY, DEBUGGING
- 79 .debug_str 000080fd 00000000 00000000 00026b1a 2**0
+ 79 .debug_str 000080ff 00000000 00000000 00026b1a 2**0
CONTENTS, READONLY, DEBUGGING
- 80 .debug_frame 00000754 00000000 00000000 0002ec18 2**2
+ 80 .debug_frame 00000754 00000000 00000000 0002ec1c 2**2
CONTENTS, READONLY, DEBUGGING
- 81 .debug_loc 00000f18 00000000 00000000 0002f36c 2**0
+ 81 .debug_loc 00000f18 00000000 00000000 0002f370 2**0
CONTENTS, READONLY, DEBUGGING
SYMBOL TABLE:
00000000 l d .text 00000000 .text
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h
index 0da4e2b6..45aad51b 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/blt_conf.h
@@ -61,7 +61,8 @@
* in bits/second. Two CAN messages are reserved for communication with the host. The
* message identifier for sending data from the target to the host is configured with
* BOOT_COM_CAN_TXMSG_ID. The one for receiving data from the host is configured with
- * BOOT_COM_CAN_RXMSG_ID. The maximum amount of data bytes in a message for data
+ * BOOT_COM_CAN_RXMSG_ID. Note that an extended 29-bit CAN identifier is configured by
+ * OR-ing with mask 0x80000000. The maximum amount of data bytes in a message for data
* transmission and reception is set through BOOT_COM_CAN_TX_MAX_DATA and
* BOOT_COM_CAN_RX_MAX_DATA, respectively. It is common for a microcontroller to have more
* than 1 CAN controller on board. The zero-based BOOT_COM_CAN_CHANNEL_INDEX selects the
@@ -73,11 +74,11 @@
/** \brief Configure the desired CAN baudrate. */
#define BOOT_COM_CAN_BAUDRATE (500000)
/** \brief Configure CAN message ID target->host. */
-#define BOOT_COM_CAN_TX_MSG_ID (0x7E1)
+#define BOOT_COM_CAN_TX_MSG_ID (0x7E1 /*| 0x80000000*/)
/** \brief Configure number of bytes in the target->host CAN message. */
#define BOOT_COM_CAN_TX_MAX_DATA (8)
/** \brief Configure CAN message ID host->target. */
-#define BOOT_COM_CAN_RX_MSG_ID (0x667)
+#define BOOT_COM_CAN_RX_MSG_ID (0x667 /*| 0x80000000*/)
/** \brief Configure number of bytes in the host->target CAN message. */
#define BOOT_COM_CAN_RX_MAX_DATA (8)
/** \brief Select the desired CAN peripheral as a zero based index. */
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/build.bat b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/build.bat
deleted file mode 100644
index 6cdb041e..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-cs-make --directory=../ all
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/clean.bat b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/clean.bat
deleted file mode 100644
index 025aaea0..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/clean.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-cs-make --directory=../ clean
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/debug.bat b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/debug.bat
deleted file mode 100644
index 12fe88aa..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/debug.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-REM Establishes a JTAG connection with the CPU so that a GDB or Insight
-REM debugging session can be started. Settings are for Remote/TCP
-REM with hostname localhost on port 3333.
-"C:\Program Files (x86)\OpenOCD\0.4.0\bin\openocd.exe" -f debug.cfg
\ No newline at end of file
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/debug.cfg b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/debug.cfg
deleted file mode 100644
index bb1c2f58..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/debug.cfg
+++ /dev/null
@@ -1,67 +0,0 @@
-set CPUTAPID 0x4f1f0f0f
-
-source [find interface/olimex-arm-usb-tiny-h.cfg]
-
-if { [info exists CHIPNAME] } {
- set _CHIPNAME $CHIPNAME
-} else {
- set _CHIPNAME lpc2294
-}
-
-if { [info exists ENDIAN] } {
- set _ENDIAN $ENDIAN
-} else {
- set _ENDIAN little
-}
-
-if { [info exists CPUTAPID ] } {
- set _CPUTAPID $CPUTAPID
-} else {
- # force an error till we get a good number
- set _CPUTAPID 0xffffffff
-}
-
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst srst_pulls_trst
-
-#jtag scan chain
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
-$_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
-
-#flash configuration
-#flash bank lpc2000 0 0
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME lpc2000 0x0 0x40000 0 0 $_TARGETNAME lpc2000_v1 20000 calc_checksum
-
-jtag_khz 0
-
-flash bank none cfi 0x80000000 0x200000 2 2 $_TARGETNAME
-
-init
-arm7_9 dcc_downloads enable
-arm7_9 fast_memory_access enable
-reset
-sleep 500
-halt
-soft_reset_halt
-gdb_breakpoint_override hard
-#PLL according to Ecos
-mww 0xE01FC080 0x1
-mww 0xE01FC084 0x22
-mww 0xE01FC08C 0xAA
-mww 0xE01FC08C 0x55
-sleep 200
-mww 0xE01FC080 0x3
-mww 0xE01FC08C 0xAA
-mww 0xE01FC08C 0x55
-mww 0xE01FC004 0x4
-mww 0xE01FC000 0x2
-
-#MEMMAP
-mww 0xE01FC040 0x0001
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/flash.bat b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/flash.bat
deleted file mode 100644
index 9fae8956..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/flash.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-REM Loads the program into flash eeprom through the JTAG interface
-"C:\Program Files (x86)\OpenOCD\0.4.0\bin\openocd.exe" -f flash.cfg
\ No newline at end of file
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/flash.cfg b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/flash.cfg
deleted file mode 100644
index 3b9ff1b6..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/cmd/flash.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-set CPUTAPID 0x4f1f0f0f
-
-source [find interface/olimex-arm-usb-tiny-h.cfg]
-
-if { [info exists CHIPNAME] } {
- set _CHIPNAME $CHIPNAME
-} else {
- set _CHIPNAME lpc2294
-}
-
-if { [info exists ENDIAN] } {
- set _ENDIAN $ENDIAN
-} else {
- set _ENDIAN little
-}
-
-if { [info exists CPUTAPID ] } {
- set _CPUTAPID $CPUTAPID
-} else {
- # force an error till we get a good number
- set _CPUTAPID 0xffffffff
-}
-
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst srst_pulls_trst
-
-#jtag scan chain
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
-$_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
-
-#flash configuration
-#flash bank lpc2000 0 0
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME lpc2000 0x0 0x40000 0 0 $_TARGETNAME lpc2000_v1 20000 calc_checksum
-
-jtag_khz 0
-
-flash bank none cfi 0x80000000 0x200000 2 2 $_TARGETNAME
-
-
-
-init
-arm7_9 dcc_downloads enable
-arm7_9 fast_memory_access enable
-reset
-sleep 500
-halt
-soft_reset_halt
-#PLL according to Ecos
-mww 0xE01FC080 0x1
-mww 0xE01FC084 0x22
-mww 0xE01FC08C 0xAA
-mww 0xE01FC08C 0x55
-sleep 200
-mww 0xE01FC080 0x3
-mww 0xE01FC08C 0xAA
-mww 0xE01FC08C 0x55
-sleep 200
-mww 0xE01FC004 0x4
-mww 0xE01FC000 0x2
-sleep 200
-
-#MEMMAP
-mww 0xE01FC040 0x0001
-
-reset run
-sleep 500
-halt
-flash probe 0
-sleep 1000
-flash write_image erase unlock ../bin/openblt_olimex_lpc_l2294_20mhz.elf
-reset run
-shutdown
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
deleted file mode 100644
index b2e7c994..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.project
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- break main
-continue
-
-
-
-
-
-
- make clean
- make
-
-
-
- None
- $(WorkspacePath)/..
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- make clean
- make
-
-
-
- None
- $(WorkspacePath)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.workspace b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.workspace
deleted file mode 100644
index 7957a1d7..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/DemoBoot.workspace
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/readme.txt b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/readme.txt
deleted file mode 100644
index 8a340a19..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/ide/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Integrated Development Environment
-----------------------------------
-Codelite was used as the editor during the development of this software program. This directory contains the Codelite
-workspace and project files. Codelite is a cross platform open source C/C++ IDE, available at http://www.codelite.org/.
\ No newline at end of file
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.elf b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.elf
index 11c5f00b..9979307e 100644
Binary files a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.elf and b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.elf differ
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.map b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.map
index 1fffcc76..02b30cd6 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.map
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/bin/demoprog_olimex_lpc_l2294_20mhz.map
@@ -94,7 +94,7 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, READONLY, DEBUGGING
33 .debug_macro 00001361 00000000 00000000 00004005 2**0
CONTENTS, READONLY, DEBUGGING
- 34 .debug_str 000068c7 00000000 00000000 00005366 2**0
+ 34 .debug_str 000068c9 00000000 00000000 00005366 2**0
CONTENTS, READONLY, DEBUGGING
35 .debug_frame 0000020c 00000000 00000000 0000bc30 2**2
CONTENTS, READONLY, DEBUGGING
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/cmd/build.bat b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/cmd/build.bat
deleted file mode 100644
index 6cdb041e..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/cmd/build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-cs-make --directory=../ all
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/cmd/clean.bat b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/cmd/clean.bat
deleted file mode 100644
index 025aaea0..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/cmd/clean.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-cs-make --directory=../ clean
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/DemoProg.project b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/DemoProg.project
deleted file mode 100644
index 6d9b215c..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/DemoProg.project
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- break main
-continue
-
-
-
-
-
-
- make clean
- make
-
-
-
- None
- $(WorkspacePath)/..
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- make clean
- make
-
-
-
- None
- $(WorkspacePath)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/DemoProg.workspace b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/DemoProg.workspace
deleted file mode 100644
index 4060139b..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/DemoProg.workspace
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/readme.txt b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/readme.txt
deleted file mode 100644
index 8a340a19..00000000
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/ide/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Integrated Development Environment
-----------------------------------
-Codelite was used as the editor during the development of this software program. This directory contains the Codelite
-workspace and project files. Codelite is a cross platform open source C/C++ IDE, available at http://www.codelite.org/.
\ No newline at end of file