summaryrefslogtreecommitdiff
path: root/quantum/template
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2020-04-09 01:18:30 +0200
committerFlorian Didron <fdidron@users.noreply.github.com>2020-06-12 17:00:27 +0900
commit7ec087183b4d79d998fca72d6a5d6aefea32c0d6 (patch)
treec11226d901c00332ffeaec5183b4a1f2f4c2fd87 /quantum/template
parent4f5c76bfbefe0141858ec7eec15f790318c2e477 (diff)
Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (#8663)
* Define NO_ACTION_MACRO/FUNCTION in header instead of makefile when LTO is enabled Currently, boards and keymaps that define NO_ACTION_MACRO/FUNCTION unconditionally will not compile with LTO_ENABLE (#8604). This fixes the issue by moving the definitions from common.mk to action.h, which enables us to check for previous definitions of those macros (this cannot be done in a makefile). * Remove LTO checks in templates Since now NO_ACTION_MACRO/FUNCTION are defined as needed in action.h (which is included by quantum.h), checking for LTO in keyboard and user code is no longer required. * Update LTO_ENABLE docs
Diffstat (limited to 'quantum/template')
-rw-r--r--quantum/template/avr/config.h4
-rw-r--r--quantum/template/ps2avrgb/config.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h
index eb9651cc0e..010a78896c 100644
--- a/quantum/template/avr/config.h
+++ b/quantum/template/avr/config.h
@@ -195,6 +195,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
/*
* MIDI options
*/
diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h
index 3cceadb319..ac1b3c8abd 100644
--- a/quantum/template/ps2avrgb/config.h
+++ b/quantum/template/ps2avrgb/config.h
@@ -46,7 +46,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 1
#define RGBLIGHT_ANIMATIONS
-#define NO_UART 1
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
/* key combination for magic key command */
/* defined by default; to change, uncomment and set to the combination you want */