Merge remote-tracking branch 'origin/master' into develop

14 files changed, 14 insertions, 14 deletions

diff --git a/keyboards/1upkeyboards/1up60hse/rules.mk b/keyboards/1upkeyboards/1up60hse/rules.mk
index 3dcd689407..b166d77f06 100644
--- a/keyboards/1upkeyboards/1up60hse/rules.mk
+++ b/keyboards/1upkeyboards/1up60hse/rules.mk
@@ -17,6 +17,6 @@ NKRO_ENABLE = yes            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 
 LAYOUTS = 60_ansi
diff --git a/keyboards/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk
index 88daf00872..b1232f5897 100644
--- a/keyboards/alf/x11/rules.mk
+++ b/keyboards/alf/x11/rules.mk
@@ -17,4 +17,4 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/butterstick/rules.mk b/keyboards/butterstick/rules.mk
index c0d463c2df..60ec14df81 100644
--- a/keyboards/butterstick/rules.mk
+++ b/keyboards/butterstick/rules.mk
@@ -13,4 +13,4 @@ STENO_ENABLE		= yes 		# Needed for chording
 
 OPT_DEFS += -DONLYQWERTY -DDEBUG_MATRIX
 SRC += sten.c
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk
index f144042edd..02ad91caa9 100644
--- a/keyboards/clueboard/66_hotswap/prototype/rules.mk
+++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk
@@ -3,4 +3,4 @@
 #
 BACKLIGHT_DRIVER = custom
 
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index 6244f79053..6c1829a02c 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -15,4 +15,4 @@ AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = AdafruitBLE
 
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/georgi/rules.mk b/keyboards/georgi/rules.mk
index 0cf996ed48..f86716908d 100644
--- a/keyboards/georgi/rules.mk
+++ b/keyboards/georgi/rules.mk
@@ -12,5 +12,5 @@ CONSOLE_ENABLE      = yes
 COMMAND_ENABLE      = no
 NKRO_ENABLE			= yes
 
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 SRC += matrix.c i2c_master.c sten.c
diff --git a/keyboards/hineybush/h87a/rules.mk b/keyboards/hineybush/h87a/rules.mk
index d4bab6bdb1..8f0c1ea107 100644
--- a/keyboards/hineybush/h87a/rules.mk
+++ b/keyboards/hineybush/h87a/rules.mk
@@ -17,4 +17,4 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable RGB underglow
 AUDIO_ENABLE = no           # Audio output
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/idobo/rules.mk b/keyboards/idobo/rules.mk
index 0b27e9e3c3..2c83baeeea 100644
--- a/keyboards/idobo/rules.mk
+++ b/keyboards/idobo/rules.mk
@@ -17,6 +17,6 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-EXTRAFLAGS += -flto        # Use link time optimization
+LTO_ENABLE = yes            # Use link time optimization
 
 LAYOUTS = ortho_5x15
diff --git a/keyboards/noxary/260/rules.mk b/keyboards/noxary/260/rules.mk
index d22906c699..285e65c53a 100644
--- a/keyboards/noxary/260/rules.mk
+++ b/keyboards/noxary/260/rules.mk
@@ -17,6 +17,6 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 
 LAYOUTS = 60_ansi 60_iso 60_hhkb 60_tsangan_hhkb
diff --git a/keyboards/percent/booster/rules.mk b/keyboards/percent/booster/rules.mk
index 40e9c81968..f53e944b1d 100644
--- a/keyboards/percent/booster/rules.mk
+++ b/keyboards/percent/booster/rules.mk
@@ -17,6 +17,6 @@ NKRO_ENABLE = no             # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 
 LAYOUTS = numpad_5x4
diff --git a/keyboards/scarletbandana/rules.mk b/keyboards/scarletbandana/rules.mk
index 9cf0d60040..2fc195a8e7 100644
--- a/keyboards/scarletbandana/rules.mk
+++ b/keyboards/scarletbandana/rules.mk
@@ -17,4 +17,4 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality, also set ISSI_ENABLE below for Miera
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/tetris/rules.mk b/keyboards/tetris/rules.mk
index 65aca98cd3..7f5d2646bf 100755
--- a/keyboards/tetris/rules.mk
+++ b/keyboards/tetris/rules.mk
@@ -16,5 +16,5 @@ NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https:/
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-EXTRAFLAGS        = -flto 
+LTO_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk
index e5930eb829..9f2ae08570 100644
--- a/keyboards/tkc/candybar/lefty/rules.mk
+++ b/keyboards/tkc/candybar/lefty/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = stm32-dfu
 # Build Options
 #   comment out to disable the options.
 #
-# EXTRAFLAGS+=-flto
+# LTO_ENABLE = yes
 LTO_ENABLE = yes
 BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk
index e5930eb829..9f2ae08570 100644
--- a/keyboards/tkc/candybar/righty/rules.mk
+++ b/keyboards/tkc/candybar/righty/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = stm32-dfu
 # Build Options
 #   comment out to disable the options.
 #
-# EXTRAFLAGS+=-flto
+# LTO_ENABLE = yes
 LTO_ENABLE = yes
 BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite