From 1643fb26c9748ba28f6950e9f17f98259ae7ef15 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 1 Mar 2016 08:09:19 +0000 Subject: Fixed bug #719. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8998 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F103-MAPLEMINI/Makefile | 7 +++++-- demos/STM32/RT-STM32F103-MAPLEMINI/readme.txt | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'demos/STM32') diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile index 1e1090d40..ee7e60c75 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile @@ -107,9 +107,9 @@ include $(CHIBIOS)/os/various/shell/shell.mk # Define linker script file here ifeq ($(USE_MAPLEMINI_BOOTLOADER),1) - LDSCRIPT = $(STARTUPLD)/STM32F103xE_maplemini_bootloader.ld + LDSCRIPT = $(STARTUPLD)/STM32F103xB_maplemini_bootloader.ld else - LDSCRIPT = $(STARTUPLD)/STM32F103xE.ld + LDSCRIPT = $(STARTUPLD)/STM32F103xB.ld endif # C sources that can be compiled in ARM or THUMB mode depending on the global @@ -206,6 +206,9 @@ CPPWARN = -Wall -Wextra -Wundef # List all user C define here, like -D_DEBUG=1 UDEFS = +ifeq ($(USE_MAPLEMINI_BOOTLOADER),1) + UDEFS += -DCORTEX_VTOR_INIT=0x5000 +endif # Define ASM defines here UADEFS = diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/readme.txt b/demos/STM32/RT-STM32F103-MAPLEMINI/readme.txt index 197a1b143..edc414932 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/readme.txt +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/readme.txt @@ -23,14 +23,13 @@ Just modify the TRGT line in the makefile in order to use different GCC ports. ** Flashing Target Board ** -To flash the firmware to the maplemini, an additional Make target has been -added. It requies dfu-util. While the MapleMini is connected via USB and +To flash the firmware to the maplemini, you can use dfu-util. While the MapleMini is connected via USB and still in bootloader mode, just run - > make flash_usb + > dfu-util -a1 -d 1eaf:0003 -D build/ch.bin -R If you compiled without the bootloader support, you will have to flash via the -original serial flashing method. Please see +original serial flashing method or via SWD. For the serial method please see http://static.leaflabs.com/pub/leaflabs/maple-docs/latest/bootloader.html#id7 for a howto. there you can also get the official bootloader files. As a quick reference: -- cgit v1.2.3