Added variants to Generic STM32F103Z and tidied up unused files in the stm32f103zxx variants folder

Author: rogerclarkmelbourne

STM32F1/boards.txt

@@ -2,6 +2,7 @@
 
 menu.cpu=Processor
 menu.cpu_upload_menu=CPU & Upload mode
+menu.device_variant=Variant
 
 menu.upload_method=Upload method
 
@@ -377,24 +378,45 @@ GenericSTM32F103C.menu.cpu_upload_menu.c8SerialJTAG.upload.protocol=maple_serial
 
 ##############################################################
 genericSTM32F103Z.name=Generic STM32F103Z
-genericSTM32F103Z.upload.maximum_size=492000
-genericSTM32F103Z.upload.ram.maximum_size=61000
-genericSTM32F103Z.upload.flash.maximum_size=492000
-genericSTM32F103Z.build.error_led_port=GPIOA
-genericSTM32F103Z.build.error_led_pin=5
+
+#genericSTM32F103Z.upload.maximum_size=492000
+#genericSTM32F103Z.upload.ram.maximum_size=61000
+#genericSTM32F103Z.upload.flash.maximum_size=492000
+
+genericSTM32F103Z.build.error_led_port=GPIOG
+genericSTM32F103Z.build.error_led_pin=15
 genericSTM32F103Z.build.variant=generic_stm32f103zxx
-genericSTM32F103Z.build.extra_flags=-DMCU_STM32F103ZE -mthumb -march=armv7-m  -D__STM32F1__  
-genericSTM32F103Z.build.ldscript=ld/jtag.ld
+
+#genericSTM32F103Z.build.extra_flags=-DMCU_STM32F103ZE -mthumb -march=armv7-m  -D__STM32F1__  
+#genericSTM32F103Z.build.ldscript=ld/jtag.ld
 
 genericSTM32F103Z.upload.tool=serial_upload
-genericSTM32F103Z.upload.protocol=maple_dfu
+genericSTM32F103Z.upload.protocol=
 genericSTM32F103Z.upload.use_1200bps_touch=false
 genericSTM32F103Z.upload.file_type=bin
-#genericSTM32F103Z.upload.usbID=1EAF:0003
-#genericSTM32F103Z.upload.altID=1
-#genericSTM32F103Z.upload.auto_reset=true
 genericSTM32F103Z.build.mcu=cortex-m3
 genericSTM32F103Z.build.f_cpu=72000000L
 genericSTM32F103Z.build.board=GENERIC_STM32F103Z
 genericSTM32F103Z.build.core=maple
-genericSTM32F103Z.build.vect=VECT_TAB_FLASH
+genericSTM32F103Z.build.vect=VECT_TAB_FLASH
+
+genericSTM32F103Z.menu.device_variant.STM32F103ZC=STM32F103ZC
+genericSTM32F103Z.menu.device_variant.STM32F103ZC.build.extra_flags=-DMCU_STM32F103ZC -mthumb -march=armv7-m  -D__STM32F1__  
+genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.maximum_size=262144
+genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.ram.maximum_size=492152
+genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.flash.maximum_size=492000
+genericSTM32F103Z.menu.device_variant.STM32F103ZC.build.ldscript=ld/stm32f103zc.ld
+
+genericSTM32F103Z.menu.device_variant.STM32F103ZD=STM32F103ZD
+genericSTM32F103Z.menu.device_variant.STM32F103ZD.build.extra_flags=-DMCU_STM32F103ZD -mthumb -march=armv7-m  -D__STM32F1__  
+genericSTM32F103Z.menu.device_variant.STM32F103ZD.upload.maximum_size=393216
+genericSTM32F103Z.menu.device_variant.STM32F103ZD.upload.ram.maximum_size=65536
+genericSTM32F103Z.menu.device_variant.STM32F103ZD.upload.flash.maximum_size=492000
+genericSTM32F103Z.menu.device_variant.STM32F103ZD.build.ldscript=ld/stm32f103zd.ld
+
+genericSTM32F103Z.menu.device_variant.STM32F103ZE=STM32F103ZE
+genericSTM32F103Z.menu.device_variant.STM32F103ZE.build.extra_flags=-DMCU_STM32F103ZE -mthumb -march=armv7-m  -D__STM32F1__  
+genericSTM32F103Z.menu.device_variant.STM32F103ZE.upload.maximum_size=524288
+genericSTM32F103Z.menu.device_variant.STM32F103ZE.upload.ram.maximum_size=65536
+genericSTM32F103Z.menu.device_variant.STM32F103ZE.upload.flash.maximum_size=492000
+genericSTM32F103Z.menu.device_variant.STM32F103ZE.build.ldscript=ld/stm32f103ze.ld

STM32F1/variants/generic_stm32f103zxx/ld/flash.ld

@@ -0,0 +1,27 @@
+/*
+ * libmaple linker script 
+ *
+ * This build puts .text (and .rodata) in Flash, and
+ * .data/.bss/heap (of course) in SRAM, but links starting at the
+ * Flash and SRAM starting addresses (0x08000000 and 0x20000000
+ * respectively). This will wipe out a Maple bootloader if there's one
+ * on the board, so only use this if you know what you're doing.
+ *
+ * This build is perfectly usable for upload over SWD,
+ * the system memory bootloader, etc. The name is just a historical
+ * artifact.
+ */
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K
+  rom (rx)  : ORIGIN = 0x08000000, LENGTH = 512K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc

STM32F1/variants/generic_stm32f103zxx/ld/mem-flash.inc

@@ -0,0 +1,27 @@
+/*
+ * libmaple linker script 
+ *
+ * This build puts .text (and .rodata) in Flash, and
+ * .data/.bss/heap (of course) in SRAM, but links starting at the
+ * Flash and SRAM starting addresses (0x08000000 and 0x20000000
+ * respectively). This will wipe out a Maple bootloader if there's one
+ * on the board, so only use this if you know what you're doing.
+ *
+ * This build is perfectly usable for upload over SWD,
+ * the system memory bootloader, etc. The name is just a historical
+ * artifact.
+ */
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
+  rom (rx)  : ORIGIN = 0x08000000, LENGTH = 512K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc

STM32F1/variants/generic_stm32f103zxx/ld/mem-jtag.inc

@@ -1,31 +1,29 @@
-/*
- * libmaple linker script for "JTAG" builds.
- *
- * A "JTAG" build puts .text (and .rodata) in Flash, and
- * .data/.bss/heap (of course) in SRAM, but links starting at the
- * Flash and SRAM starting addresses (0x08000000 and 0x20000000
- * respectively). This will wipe out a Maple bootloader if there's one
- * on the board, so only use this if you know what you're doing.
- *
- * Of course, a "JTAG" build is perfectly usable for upload over SWD,
- * the system memory bootloader, etc. The name is just a historical
- * artifact.
- */
-
-/*
- * This pulls in the appropriate MEMORY declaration from the right
- * subdirectory of stm32/mem/ (the environment must call ld with the
- * right include directory flags to make this happen). Boards can also
- * use this file to use any of libmaple's memory-related hooks (like
- * where the heap should live).
- */
-INCLUDE mem-jtag.inc
-
-/* Provide memory region aliases for common.inc */
-REGION_ALIAS("REGION_TEXT", rom);
-REGION_ALIAS("REGION_DATA", ram);
-REGION_ALIAS("REGION_BSS", ram);
-REGION_ALIAS("REGION_RODATA", rom);
-
-/* Let common.inc handle the real work. */
-INCLUDE common.inc
+/*
+ * libmaple linker script 
+ *
+ * This build puts .text (and .rodata) in Flash, and
+ * .data/.bss/heap (of course) in SRAM, but links starting at the
+ * Flash and SRAM starting addresses (0x08000000 and 0x20000000
+ * respectively). This will wipe out a Maple bootloader if there's one
+ * on the board, so only use this if you know what you're doing.
+ *
+ * This build is perfectly usable for upload over SWD,
+ * the system memory bootloader, etc. The name is just a historical
+ * artifact.
+ */
+
+
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
+  rom (rx)  : ORIGIN = 0x08000000, LENGTH = 512K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc