Update some makefiles and openocd config files

11 files changed, 46 insertions, 40 deletions

diff --git a/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/Makefile b/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/Makefile
index f163dad2..4d6cf31a 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/Makefile
+++ b/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/Makefile
@@ -16,10 +16,12 @@
 	GFXLIB					= ../uGFX
 	GFXBOARD				= Mikromedia-Plus-STM32-M4
 	GFXDEMO					= modules/gdisp/basics
+	GFXSINGLEMAKE			= no
 
 # ChibiOS settings
 ifeq ($(OPT_OS),chibios)
 	# See $(GFXLIB)/tools/gmake_scripts/os_chibios.mk for the list of variables
+	CHIBIOS_VERSION		= 2
 	CHIBIOS				= ../ChibiOS
 	CHIBIOS_BOARD		=
 	CHIBIOS_PLATFORM	= STM32F4xx
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/openocd.cfg b/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/openocd.cfg
index f8b6a6f5..b4395b52 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/openocd.cfg
+++ b/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_2.x/openocd.cfg
@@ -1,4 +1,4 @@
-# This is a script file for OpenOCD 0.7.0
+# This is a script file for OpenOCD ?.?.?
 #
 # It is set up for the Mikromedia-STM32M4 board using the ST-Link JTAG adaptor.
 #
@@ -32,11 +32,11 @@ source [find interface/stlink-v2.cfg]
 
 echo ""
 echo "##### Loading CPU..."
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 echo ""
 echo "##### Configuring..."
-reset_config srst_only srst_nogate
+#reset_config srst_only srst_nogate
 #cortex_m maskisr (auto|on|off)
 #cortex_m vector_catch [all|none|list]
 #cortex_m reset_config (srst|sysresetreq|vectreset)
@@ -58,10 +58,10 @@ proc Burn {file} {
 	# If this happens to you - use the ST-Link utility to set the option byte back to normal.
 	# If you are using a different debugger eg a FT2232 based adapter you can uncomment the line below.
 	#stm32f2x unlock 0
-	flash protect 0 0 last off
-	reset init
-	flash write_image erase $file 0x08000000
-	verify_image $file 0x0
+	#flash protect 0 0 last off
+	reset halt
+	flash write_image erase $file 0 elf
+	verify_image $file 0x0 elf
 	#flash protect 0 0 last on
 	reset
 	echo "Burning Complete!"
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_3.x/openocd.cfg b/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_3.x/openocd.cfg
index f8b6a6f5..b4395b52 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_3.x/openocd.cfg
+++ b/boards/base/Mikromedia-Plus-STM32-M4/example_chibios_3.x/openocd.cfg
@@ -1,4 +1,4 @@
-# This is a script file for OpenOCD 0.7.0
+# This is a script file for OpenOCD ?.?.?
 #
 # It is set up for the Mikromedia-STM32M4 board using the ST-Link JTAG adaptor.
 #
@@ -32,11 +32,11 @@ source [find interface/stlink-v2.cfg]
 
 echo ""
 echo "##### Loading CPU..."
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 echo ""
 echo "##### Configuring..."
-reset_config srst_only srst_nogate
+#reset_config srst_only srst_nogate
 #cortex_m maskisr (auto|on|off)
 #cortex_m vector_catch [all|none|list]
 #cortex_m reset_config (srst|sysresetreq|vectreset)
@@ -58,10 +58,10 @@ proc Burn {file} {
 	# If this happens to you - use the ST-Link utility to set the option byte back to normal.
 	# If you are using a different debugger eg a FT2232 based adapter you can uncomment the line below.
 	#stm32f2x unlock 0
-	flash protect 0 0 last off
-	reset init
-	flash write_image erase $file 0x08000000
-	verify_image $file 0x0
+	#flash protect 0 0 last off
+	reset halt
+	flash write_image erase $file 0 elf
+	verify_image $file 0x0 elf
 	#flash protect 0 0 last on
 	reset
 	echo "Burning Complete!"
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
index 7eb8eb3e..69eb7d59 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
@@ -20,6 +20,7 @@
 # ChibiOS settings
 ifeq ($(OPT_OS),chibios)
 	# See $(GFXLIB)/tools/gmake_scripts/os_chibios.mk for the list of variables
+	CHIBIOS_VERSION		= 2
 	CHIBIOS				= ../ChibiOS
 	CHIBIOS_BOARD		=
 	CHIBIOS_PLATFORM	= STM32F4xx
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/openocd.cfg b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/openocd.cfg
index f8b6a6f5..83395e5a 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/openocd.cfg
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/openocd.cfg
@@ -32,11 +32,11 @@ source [find interface/stlink-v2.cfg]
 
 echo ""
 echo "##### Loading CPU..."
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 echo ""
 echo "##### Configuring..."
-reset_config srst_only srst_nogate
+#reset_config srst_only srst_nogate
 #cortex_m maskisr (auto|on|off)
 #cortex_m vector_catch [all|none|list]
 #cortex_m reset_config (srst|sysresetreq|vectreset)
@@ -58,10 +58,10 @@ proc Burn {file} {
 	# If this happens to you - use the ST-Link utility to set the option byte back to normal.
 	# If you are using a different debugger eg a FT2232 based adapter you can uncomment the line below.
 	#stm32f2x unlock 0
-	flash protect 0 0 last off
-	reset init
-	flash write_image erase $file 0x08000000
-	verify_image $file 0x0
+	#flash protect 0 0 last off
+	reset halt
+	flash write_image erase $file 0 elf
+	verify_image $file 0x0 elf
 	#flash protect 0 0 last on
 	reset
 	echo "Burning Complete!"
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/openocd.cfg b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/openocd.cfg
index f8b6a6f5..83395e5a 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/openocd.cfg
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/openocd.cfg
@@ -32,11 +32,11 @@ source [find interface/stlink-v2.cfg]
 
 echo ""
 echo "##### Loading CPU..."
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 echo ""
 echo "##### Configuring..."
-reset_config srst_only srst_nogate
+#reset_config srst_only srst_nogate
 #cortex_m maskisr (auto|on|off)
 #cortex_m vector_catch [all|none|list]
 #cortex_m reset_config (srst|sysresetreq|vectreset)
@@ -58,10 +58,10 @@ proc Burn {file} {
 	# If this happens to you - use the ST-Link utility to set the option byte back to normal.
 	# If you are using a different debugger eg a FT2232 based adapter you can uncomment the line below.
 	#stm32f2x unlock 0
-	flash protect 0 0 last off
-	reset init
-	flash write_image erase $file 0x08000000
-	verify_image $file 0x0
+	#flash protect 0 0 last off
+	reset halt
+	flash write_image erase $file 0 elf
+	verify_image $file 0x0 elf
 	#flash protect 0 0 last on
 	reset
 	echo "Burning Complete!"
diff --git a/boards/base/Olimex-SAM7EX256-GE8/example/Makefile b/boards/base/Olimex-SAM7EX256-GE8/example/Makefile
index 652d43dd..60a46752 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/example/Makefile
+++ b/boards/base/Olimex-SAM7EX256-GE8/example/Makefile
@@ -16,6 +16,7 @@
 	GFXLIB					= ../uGFX
 	GFXBOARD				= Olimex-SAM7EX256-GE8
 	GFXDEMO					= modules/gdisp/basics
+	GFXSINGLEMAKE			= no
 
 # ChibiOS settings
 ifeq ($(OPT_OS),chibios)
diff --git a/boards/base/STM32F429i-Discovery/example_chibios_2.x/Makefile b/boards/base/STM32F429i-Discovery/example_chibios_2.x/Makefile
index 6c1bb94c..37dd4b5e 100644
--- a/boards/base/STM32F429i-Discovery/example_chibios_2.x/Makefile
+++ b/boards/base/STM32F429i-Discovery/example_chibios_2.x/Makefile
@@ -16,6 +16,7 @@
 	GFXLIB					= ../uGFX
 	GFXBOARD				= STM32F429i-Discovery
 	GFXDEMO					= modules/gdisp/basics
+	GFXSINGLEMAKE			= no
 
 # ChibiOS settings
 ifeq ($(OPT_OS),chibios)
diff --git a/boards/base/STM32F429i-Discovery/example_chibios_2.x/openocd.cfg b/boards/base/STM32F429i-Discovery/example_chibios_2.x/openocd.cfg
index f8b6a6f5..b4395b52 100644
--- a/boards/base/STM32F429i-Discovery/example_chibios_2.x/openocd.cfg
+++ b/boards/base/STM32F429i-Discovery/example_chibios_2.x/openocd.cfg
@@ -1,4 +1,4 @@
-# This is a script file for OpenOCD 0.7.0
+# This is a script file for OpenOCD ?.?.?
 #
 # It is set up for the Mikromedia-STM32M4 board using the ST-Link JTAG adaptor.
 #
@@ -32,11 +32,11 @@ source [find interface/stlink-v2.cfg]
 
 echo ""
 echo "##### Loading CPU..."
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 echo ""
 echo "##### Configuring..."
-reset_config srst_only srst_nogate
+#reset_config srst_only srst_nogate
 #cortex_m maskisr (auto|on|off)
 #cortex_m vector_catch [all|none|list]
 #cortex_m reset_config (srst|sysresetreq|vectreset)
@@ -58,10 +58,10 @@ proc Burn {file} {
 	# If this happens to you - use the ST-Link utility to set the option byte back to normal.
 	# If you are using a different debugger eg a FT2232 based adapter you can uncomment the line below.
 	#stm32f2x unlock 0
-	flash protect 0 0 last off
-	reset init
-	flash write_image erase $file 0x08000000
-	verify_image $file 0x0
+	#flash protect 0 0 last off
+	reset halt
+	flash write_image erase $file 0 elf
+	verify_image $file 0x0 elf
 	#flash protect 0 0 last on
 	reset
 	echo "Burning Complete!"
diff --git a/boards/base/STM32F429i-Discovery/example_chibios_3.x/Makefile b/boards/base/STM32F429i-Discovery/example_chibios_3.x/Makefile
index d7ee1d20..4a1d6a94 100644
--- a/boards/base/STM32F429i-Discovery/example_chibios_3.x/Makefile
+++ b/boards/base/STM32F429i-Discovery/example_chibios_3.x/Makefile
@@ -16,6 +16,7 @@
 	GFXLIB					= ../path/to/ugfx
 	GFXBOARD				= STM32F429i-Discovery
 	GFXDEMO					= modules/gdisp/basics
+	GFXSINGLEMAKE			= no
 
 # ChibiOS settings
 ifeq ($(OPT_OS),chibios)
diff --git a/boards/base/STM32F429i-Discovery/example_chibios_3.x/openocd.cfg b/boards/base/STM32F429i-Discovery/example_chibios_3.x/openocd.cfg
index f8b6a6f5..b4395b52 100644
--- a/boards/base/STM32F429i-Discovery/example_chibios_3.x/openocd.cfg
+++ b/boards/base/STM32F429i-Discovery/example_chibios_3.x/openocd.cfg
@@ -1,4 +1,4 @@
-# This is a script file for OpenOCD 0.7.0
+# This is a script file for OpenOCD ?.?.?
 #
 # It is set up for the Mikromedia-STM32M4 board using the ST-Link JTAG adaptor.
 #
@@ -32,11 +32,11 @@ source [find interface/stlink-v2.cfg]
 
 echo ""
 echo "##### Loading CPU..."
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 echo ""
 echo "##### Configuring..."
-reset_config srst_only srst_nogate
+#reset_config srst_only srst_nogate
 #cortex_m maskisr (auto|on|off)
 #cortex_m vector_catch [all|none|list]
 #cortex_m reset_config (srst|sysresetreq|vectreset)
@@ -58,10 +58,10 @@ proc Burn {file} {
 	# If this happens to you - use the ST-Link utility to set the option byte back to normal.
 	# If you are using a different debugger eg a FT2232 based adapter you can uncomment the line below.
 	#stm32f2x unlock 0
-	flash protect 0 0 last off
-	reset init
-	flash write_image erase $file 0x08000000
-	verify_image $file 0x0
+	#flash protect 0 0 last off
+	reset halt
+	flash write_image erase $file 0 elf
+	verify_image $file 0x0 elf
 	#flash protect 0 0 last on
 	reset
 	echo "Burning Complete!"