Use new env for board-oriented extra flags

MarlinFirmware · Mar 5, 2021 · b19abb1 · b19abb1
1 parent f56929d
commit b19abb1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 31 deletions.
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -25,10 +25,6 @@
   #define BOARD_INFO_NAME "BTT SKR V1.4"
 #endif
 
-#ifndef BOARD_CUSTOM_BUILD_FLAGS
-  #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
-#endif
-
 //
 // SD Connection
 //

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -378,7 +378,7 @@
 #elif MB(BTT_SKR_V1_3)
   #include "lpc1768/pins_BTT_SKR_V1_3.h"        // LPC1768                                env:LPC1768
 #elif MB(BTT_SKR_V1_4)
-  #include "lpc1768/pins_BTT_SKR_V1_4.h"        // LPC1768                                env:LPC1768
+  #include "lpc1768/pins_BTT_SKR_V1_4.h"        // LPC1768                                env:LPC1768_btt_skr_v1_4
 
 //
 // LPC1769 ARM Cortex M3

diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -42,9 +42,6 @@
   #warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
 #endif
 
-// Custom flags and defines for the build
-//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
-
 #define BOARD_INFO_NAME "LGT KIT V1.0"
 
 //

diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -55,9 +55,6 @@
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' (or other appropriate target) in 'Tools > Board.'"
 #endif
 
-// Custom flags and defines for the build
-//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "RAMPS 1.4"
 #endif

diff --git a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h
@@ -38,9 +38,6 @@
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif
 
-// Custom flags and defines for the build
-//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "RAMPS S 1.2"
 #endif

diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies-post.py b/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
diff --git a/platformio.ini b/platformio.ini
@@ -215,7 +215,6 @@ extra_scripts      =
   pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
   pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
   pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
-  post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
 build_flags        = -fmax-errors=5 -g3 -D__MARLIN_FIRMWARE__ -fmerge-constants
 lib_deps           =
 
@@ -728,6 +727,12 @@ platform = ${common_LPC.platform}
 extends  = common_LPC
 board    = nxp_lpc1769
 
+# BTT SKR 1.4 needs a UART3 tweak
+[env:LPC1768_btt_skr_v1_4]
+platform    = ${LPC1768.platform}
+extends     = env:LPC1768
+build_flags = ${env:LPC1768.build_flags} -DLPC_PINCFG_UART3_P4_28
+
 #################################
 #                               #
 #      STM32 Architecture       #