Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 50 insertions, 0 deletions

diff --git a/keyboards/zinc/config.h b/keyboards/zinc/config.h
new file mode 100644
index 000000000..9c60d631b
--- /dev/null
+++ b/keyboards/zinc/config.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+//#ifndef CONFIG_H
+//#define CONFIG_H
+
+#include "config_common.h"
+
+// GCC include 'config.h" sequence in qmk_firmware/keyboards/zinc/
+//   -include keyboards/zinc/config.h
+//   -include keyboards/zinc/rev?/config.h
+//   -include keyboards/zinc/rev?/keymaps/MAPNAME/config.h
+//   XXXX.c
+
+#include <serial_config.h>
+
+// GCC include search path in qmk_firmare/keyboards/zinc/
+//    #include "..." search starts here:
+//    #include <...> search starts here:
+//     keyboards/zinc/rev?/keymaps/MAPNAME
+//     keyboards/zinc
+//     keyboards/zinc/rev?
+//     .
+//     ./tmk_core
+//     ......
+
+#ifdef USE_Link_Time_Optimization
+  // LTO has issues with macros (action_get_macro) and "functions" (fn_actions),
+  //  so just disable them
+  #define NO_ACTION_MACRO
+  #define NO_ACTION_FUNCTION
+#endif // USE_Link_Time_Optimization
+
+//#endif /* CONFIG_H */