Merge pull request #25 from omicronns/master

Create Nucleo target without bootloader support.

Author: devanlai

Makefile

@@ -93,6 +93,12 @@ DAP42K6U.bin: | $(BUILD_DIR)
 	$(Q)$(MAKE) TARGET=DAP42K6U -C src/
 	$(Q)cp src/DAP42.bin $(BUILD_DIR)/$(@)
 
+DAP103-NUCLEO.bin: | $(BUILD_DIR)
+	@printf "  BUILD $(@)\n"
+	$(Q)$(MAKE) TARGET=STLINKV2-1 -C src/ clean
+	$(Q)$(MAKE) TARGET=STLINKV2-1 -C src/
+	$(Q)cp src/DAP42.bin $(BUILD_DIR)/$(@)
+
 DAP103-NUCLEO-STBOOT.bin: | $(BUILD_DIR)
 	@printf "  BUILD $(@)\n"
 	$(Q)$(MAKE) TARGET=STLINKV2-1-STBOOT -C src/ clean

src/stm32f103/stlinkv2-1/config.h

@@ -33,7 +33,7 @@
 #define CDC_AVAILABLE 1
 #define DEFAULT_BAUDRATE 115200
 
-#define CONSOLE_USART USART1
+#define CONSOLE_USART USART2
 #define CONSOLE_TX_BUFFER_SIZE 128
 #define CONSOLE_RX_BUFFER_SIZE 4096
 
@@ -50,7 +50,7 @@
 #define CONSOLE_RX_DMA_CONTROLLER DMA1
 #define CONSOLE_RX_DMA_CLOCK RCC_DMA1
 #define CONSOLE_RX_DMA_CHANNEL DMA_CHANNEL6
- 
+
 #define BULK_AVAILABLE 1
 #define HID_AVAILABLE 0
 #define WINUSB_AVAILABLE 1

src/stm32f103/stlinkv2-1/target.c

@@ -26,6 +26,7 @@
 
 /* Reconfigure processor settings */
 void cpu_setup(void) {
+#if DFU_AVAILABLE
     /* Disable any interrupts enabled by the bootloader */
     int i = 0;
     for (i=0; i*32 < NVIC_IRQ_COUNT; i++) {
@@ -34,6 +35,7 @@ void cpu_setup(void) {
 
     /* Relocate the vector table */
     SCB_VTOR = 0x08004000;
+#endif
 }
 
 /* Set STM32 to 72 MHz. */

…tlinkv2-1/stm32f103x8-stlinkv2-1-boot.ld …stm32f103/stm32f103x8-stlinkv2-1-boot.ldsrc/stm32f103/stlinkv2-1/stm32f103x8-stlinkv2-1-boot.ld renamed to src/stm32f103/stm32f103x8-stlinkv2-1-boot.ld src/stm32f103/stlinkv2-1/stm32f103x8-stlinkv2-1-boot.ld renamed to src/stm32f103/stm32f103x8-stlinkv2-1-boot.ld

@@ -102,10 +102,17 @@ ifeq ($(TARGET),STLINKV2-DONGLE-DAPBOOT)
 	ARCH                = STM32F1
 	DFU_VID_PID        := 1209:db42
 endif
+ifeq ($(TARGET),STLINKV2-1)
+	TARGET_COMMON_DIR  := ./stm32f103
+	TARGET_SPEC_DIR    := ./stm32f103/stlinkv2-1
+	LDSCRIPT           ?= ./stm32f103/stm32f103x8.ld
+	DEFS               += -DDFU_AVAILABLE=0
+	ARCH                = STM32F1
+endif
 ifeq ($(TARGET),STLINKV2-1-STBOOT)
 	TARGET_COMMON_DIR  := ./stm32f103
 	TARGET_SPEC_DIR    := ./stm32f103/stlinkv2-1
-	LDSCRIPT           ?= ./stm32f103/stlinkv2-1/stm32f103x8-stlinkv2-1-boot.ld
+	LDSCRIPT           ?= ./stm32f103/stm32f103x8-stlinkv2-1-boot.ld
 	DEFS               += -DDFU_AVAILABLE=1
 	ARCH                = STM32F1
 endif