Merge remote-tracking branch 'upstream/master' into bttskrminie3v2

# Conflicts:
#	src/targets.mk

Author: twelho

src/stm32f103/bluepillplus-gd32/config.h

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016, Devan Lai
+ *
+ * Permission to use, copy, modify, and/or distribute this software
+ * for any purpose with or without fee is hereby granted, provided
+ * that the above copyright notice and this permission notice
+ * appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
+
+#ifndef APP_BASE_ADDRESS
+#define APP_BASE_ADDRESS (0x08000000 + BOOTLOADER_OFFSET)
+#endif
+#ifndef FLASH_SIZE_OVERRIDE
+#define FLASH_SIZE_OVERRIDE 0x20000
+#endif
+#ifndef FLASH_PAGE_SIZE
+#define FLASH_PAGE_SIZE 2048
+#endif
+#ifndef DFU_UPLOAD_AVAILABLE
+#define DFU_UPLOAD_AVAILABLE 1
+#endif
+#ifndef DFU_DOWNLOAD_AVAILABLE
+#define DFU_DOWNLOAD_AVAILABLE 1
+#endif
+
+#ifndef HAVE_LED
+#define HAVE_LED 1
+#endif
+#ifndef LED_OPEN_DRAIN
+#define LED_OPEN_DRAIN 0
+#endif
+#ifndef LED_GPIO_PORT
+#define LED_GPIO_PORT GPIOB
+#endif
+#ifndef LED_GPIO_PIN
+#define LED_GPIO_PIN GPIO2
+#endif
+
+#ifndef HAVE_BUTTON
+#define HAVE_BUTTON 1
+#endif
+#ifndef BUTTON_ACTIVE_HIGH
+#define BUTTON_ACTIVE_HIGH 1
+#endif
+#ifndef BUTTON_GPIO_PORT
+#define BUTTON_GPIO_PORT GPIOA
+#endif
+#ifndef BUTTON_GPIO_PIN
+#define BUTTON_GPIO_PIN GPIO0
+#endif
+#ifndef BUTTON_USES_PULL
+#define BUTTON_USES_PULL 1
+#endif
+#ifndef BUTTON_SAMPLE_DELAY_CYCLES
+#define BUTTON_SAMPLE_DELAY_CYCLES 1440000
+#endif
+
+#ifndef HAVE_USB_PULLUP_CONTROL
+#define HAVE_USB_PULLUP_CONTROL 0
+#endif
+
+#ifndef USES_GPIOA
+#define USES_GPIOA 1
+#endif
+#ifndef USES_GPIOB
+#define USES_GPIOB 1
+#endif
+
+#endif

src/targets.mk

@@ -120,6 +120,12 @@ ifeq ($(TARGET),BLUEPILLPLUSSTM32_HIGH_128)
 	ARCH			= STM32F1
 	DEFS			+= -DBOOTLOADER_HIGH
 endif
+ifeq ($(TARGET),BLUEPILLPLUSGD32)
+	TARGET_COMMON_DIR	:= ./stm32f103
+	TARGET_SPEC_DIR		:= ./stm32f103/bluepillplus-gd32
+	LDSCRIPT		:= ./stm32f103/stm32f103x8.ld
+	ARCH			= STM32F1
+endif
 ifeq ($(TARGET),BTTSKRMINIE3V2)
 	TARGET_COMMON_DIR	:= ./stm32f103
 	TARGET_SPEC_DIR		:= ./stm32f103/skrminie3v2