Rename, clean up boards/variants (#21655)

* Consolidate variant scripts * Rename Marlin-local boards * Simplify variants where possible * Rename variants * CHITU_F103 and MEEB_3DP: Maple platform `platformio-build-stm32f1.py` uses the 'board' name, not 'board_build.variant' so folder names match 'board' and not `board_build.variant`.
2021-04-27 04:49:21 -05:00
parent 4da3f45f41
commit 0db64af9b2
167 changed files with 340 additions and 840 deletions
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -35,9 +35,9 @@ board    = megaatmega2560
 [env:mega2560ext]
 platform            = atmelavr
 extends             = env:mega2560
-board_build.variant = megaextendedpins
+board_build.variant = MARLIN_MEGA_EXTENDED
 extra_scripts       = ${common.extra_scripts}
-                      pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py
+                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py

 #
 # ATmega1280
@@ -52,9 +52,9 @@ board    = megaatmega1280
 #
 [mega_extended_optimized]
 extends             = common_avr8
-board_build.variant = megaextendedpins
+board_build.variant = MARLIN_MEGA_EXTENDED
 extra_scripts       = ${common.extra_scripts}
-                      pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py
+                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 upload_speed        = 57600
 build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues

@@ -88,7 +88,7 @@ board    = reprap_rambo
 [env:FYSETC_F6]
 platform = atmelavr
 extends  = common_avr8
-board    = fysetc_f6
+board    = fysetc_f6_13

 #
 # Sanguinololu (ATmega644p)
@@ -161,7 +161,7 @@ build_flags = ${tuned_1284p.build_flags}
 [env:at90usb1286_cdc]
 platform   = teensy
 extends    = common_avr8
-board      = at90usb1286
+board      = marlin_at90usb1286
 lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet

 #
--- a/ini/due.ini
+++ b/ini/due.ini
@@ -31,7 +31,7 @@ board    = dueUSB
 [common_DUE_archim]
 platform                 = atmelsam
 extends                  = env:DUE
-board                    = archim
+board                    = marlin_archim
 build_flags              = ${common.build_flags}
  -DARDUINO_SAM_ARCHIM -DARDUINO_ARCH_SAM -D__SAM3X8E__ -DUSBCON
 board_build.variants_dir = buildroot/share/PlatformIO/variants/
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -25,7 +25,7 @@
 [env:STM32F070RB_malyan]
 platform    = ${common_stm32.platform}
 extends     = common_stm32
-board       = malyanM200v2
+board       = marlin_malyanM200v2
 build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
  -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
  -DCUSTOM_STARTUP_FILE
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -65,7 +65,7 @@ monitor_speed     = 115200
 [env:STM32F103RC_meeb]
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
-board             = MEEB_3DP
+board             = marlin_MEEB_3DP
 build_flags       = ${common_stm32f1.build_flags}
                    -DDEBUG_LEVEL=0
                    -DSS_TIMER=4
@@ -114,8 +114,10 @@ upload_protocol   = serial
 [env:STM32F103RC_btt]
 platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RC
+board_build.address  = 0x08007000
+board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
 extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
+  buildroot/share/PlatformIO/scripts/custom_board.py
 build_flags       = ${common_stm32f1.build_flags}
  -DDEBUG_LEVEL=0 -DSS_TIMER=4
 monitor_speed     = 115200
@@ -130,6 +132,7 @@ lib_deps          = ${env:STM32F103RC_btt.lib_deps}
 [env:STM32F103RC_btt_512K]
 platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RC_btt
+board_build.ldscript = STM32F103RC_SKR_MINI_512K.ld
 board_upload.maximum_size=524288
 build_flags       = ${env:STM32F103RC_btt.build_flags} -DSTM32_FLASH_SIZE=512

@@ -156,8 +159,10 @@ monitor_speed     = 115200
 [env:STM32F103RE_btt]
 platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RE
+board_build.address  = 0x08007000
+board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
 extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
+  buildroot/share/PlatformIO/scripts/custom_board.py
 build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 debug_tool        = stlink
 upload_protocol   = stlink
@@ -190,7 +195,10 @@ upload_protocol = serial
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103VE
+board_build.address  = 0x08010000
+board_build.ldscript = STM32F103VE_longer.ld
 extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 build_flags   = ${common_stm32f1.build_flags}
  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
@@ -330,7 +338,10 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103ZE
+board_build.address  = 0x0800A000
+board_build.ldscript = jgaurora_a5s_a1.ld
 extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
 build_flags   = ${common_stm32f1.build_flags}
  -DSTM32F1xx -DSTM32_XL_DENSITY
@@ -341,7 +352,7 @@ build_flags   = ${common_stm32f1.build_flags}
 [env:STM32F103CB_malyan]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
-board         = malyanM200
+board         = marlin_malyanM200
 build_flags   = ${common_stm32f1.build_flags}
  -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections
  -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
@@ -354,7 +365,7 @@ lib_ignore    = ${common_stm32f1.lib_ignore}
 [env:chitu_f103]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
-board         = CHITU_F103
+board         = marlin_CHITU_F103
 extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
  buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -379,9 +390,11 @@ build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 platform        = ${env:STM32F103RE.platform}
 extends         = env:STM32F103RE
 build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4
+board_build.address  = 0x08007000
+board_build.ldscript = creality.ld
 extra_scripts   = ${env:STM32F103RE.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
+  buildroot/share/PlatformIO/scripts/custom_board.py
 debug_tool      = jlink
 upload_protocol = jlink

--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -36,13 +36,12 @@ build_flags   = ${common_stm32.build_flags}
 [env:STM32F401VE_STEVAL]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = STEVAL_STM32F401VE
+board             = marlin_STEVAL_STM32F401VE
 build_flags       = ${common_stm32.build_flags}
  -DARDUINO_STEVAL -DSTM32F401xE
  -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 extra_scripts     = ${common.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/STM32F401VE_STEVAL.py

 #
 # STM32F401RC
@@ -50,38 +49,41 @@ extra_scripts     = ${common.extra_scripts}
 [env:FYSETC_CHEETAH_V20]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = FYSETC_CHEETAH_V20
+board             = marlin_FYSETC_CHEETAH_V20
 build_flags       = ${common_stm32.build_flags} -DSTM32F401xC -DVECT_TAB_OFFSET=0xC000
 extra_scripts     = ${common.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/FYSETC_CHEETAH_V20.py

 #
 # FLYF407ZG
 #
 [env:FLYF407ZG]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = FLYF407ZG
-build_flags       = ${common_stm32.build_flags}
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = marlin_STM32F407ZGT6
+board_build.variant = MARLIN_FLY_F407ZG
+upload_protocol     = dfu
+build_flags         = ${common_stm32.build_flags}
  -DVECT_TAB_OFFSET=0x8000
-extra_scripts     = ${common.extra_scripts}
+extra_scripts       = ${common.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py

 #
-# FLY MINI(stm32f103rct6)
+# FLY MINI (STM32F103RCT6)
 #
 [env:FLY_MINI]
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RC
+board_build.address  = 0x08005000
+board_build.ldscript = fly_mini.ld
 extra_scripts     = ${common_stm32f1.extra_scripts}
- buildroot/share/PlatformIO/scripts/fly_mini.py
+  buildroot/share/PlatformIO/scripts/custom_board.py
 build_flags       = ${common_stm32f1.build_flags}
- -DDEBUG_LEVEL=0 -DSS_TIMER=4
+  -DDEBUG_LEVEL=0 -DSS_TIMER=4

 #
-# FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
+# FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #
 [env:FYSETC_S6]
 platform          = ${common_stm32.platform}
@@ -105,7 +107,7 @@ upload_command    = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 [env:STM32F407VE_black]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = blackSTM32F407VET6
+board             = marlin_blackSTM32F407VET6
 build_flags       = ${common_stm32.build_flags}
  -DARDUINO_BLACK_F407VE
  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
@@ -121,7 +123,7 @@ extra_scripts     = ${common.extra_scripts}
 platform             = ${common_stm32.platform}
 extends              = common_stm32
 build_flags          = ${common_stm32.build_flags} -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
-board                = genericSTM32F407VGT6
+board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.ldscript = ldscript.ld
@@ -144,7 +146,7 @@ extra_scripts        = ${common.extra_scripts}
 [env:BIGTREE_SKR_PRO]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = BigTree_SKR_Pro
+board             = marlin_BigTree_SKR_Pro
 build_flags       = ${common_stm32.build_flags}
  -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
 extra_scripts     = ${common.extra_scripts}
@@ -180,7 +182,7 @@ build_flags       = ${stm_flash_drive.build_flags}
 platform            = ${common_stm32.platform}
 extends             = common_stm32
 board               = genericSTM32F407VGT6
-board_build.variant = BIGTREE_E3_RRF
+board_build.variant = MARLIN_BIGTREE_E3_RRF
 build_flags         = ${common_stm32.build_flags}
  -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
  -DSERIAL_RX_BUFFER_SIZE=255 -DSERIAL_TX_BUFFER_SIZE=255
@@ -193,7 +195,7 @@ extra_scripts       = ${common.extra_scripts}
 [env:BIGTREE_GTR_V1_0]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = BigTree_GTR_v1
+board             = marlin_BigTree_GTR_v1
 extra_scripts     = ${common.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 build_flags       = ${common_stm32.build_flags}
@@ -215,7 +217,7 @@ build_flags       = ${stm_flash_drive.build_flags}
 [env:BIGTREE_BTT002]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = BigTree_Btt002
+board             = marlin_BigTree_BTT002
 build_flags       = ${common_stm32.build_flags}
  -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
  -DHAVE_HWSERIAL2
@@ -251,11 +253,12 @@ build_flags       = ${stm_flash_drive.build_flags}
 [lerdge_common]
 platform            = ${common_stm32.platform}
 extends             = common_stm32
-board               = LERDGE
+board               = marlin_STM32F407ZGT6
+board_build.variant = MARLIN_LERDGE
 board_build.offset  = 0x10000
 board_build.encrypt = Yes
 extra_scripts       = ${common.extra_scripts}
-                      pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py
+                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
                      buildroot/share/PlatformIO/scripts/stm32_bootloader.py
                      buildroot/share/PlatformIO/scripts/lerdge.py
 build_flags         = ${common_stm32.build_flags}
@@ -377,7 +380,7 @@ build_flags = -DPIN_WIRE_SCL=PB6 -DPIN_WIRE_SDA=PB7
 platform             = ${common_stm32.platform}
 extends              = common_stm32
 build_flags          = ${common_stm32.build_flags} ${stm32f4_I2C1.build_flags} -DHAL_PCD_MODULE_ENABLED -DUSBCON -DUSBD_USE_CDC
-board                = genericSTM32F407VGT6
+board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.ldscript = ldscript.ld
--- a/ini/stm32f7.ini
+++ b/ini/stm32f7.ini
@@ -46,7 +46,7 @@ build_flags   = ${common_stm32.build_flags}
 platform          = ${common_stm32.platform}
 platform_packages = ${stm_flash_drive.platform_packages}
 extends           = common_stm32
-board             = BTT_SKR_SE_BX
+board             = marlin_BTT_SKR_SE_BX
 extra_scripts     = ${common.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 build_flags       = ${common_stm32.build_flags}