summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/acheron/arctic/chconf.h12
-rw-r--r--keyboards/acheron/austin/chconf.h14
-rw-r--r--keyboards/acheron/keebspcb/chconf.h14
-rw-r--r--keyboards/acheron/lasgweloth/chconf.h12
-rw-r--r--keyboards/aeboards/ext65/rev2/chconf.h12
-rw-r--r--keyboards/ai03/vega/chconf.h14
-rw-r--r--keyboards/akegata_denki/device_one/chconf.h4
-rw-r--r--keyboards/at_at/660m/chconf.h14
-rw-r--r--keyboards/box75/chconf.h12
-rw-r--r--keyboards/bt66tech/bt66tech60/chconf.h12
-rw-r--r--keyboards/cannonkeys/an_c/chconf.h14
-rw-r--r--keyboards/cannonkeys/atlas/chconf.h14
-rw-r--r--keyboards/cannonkeys/chimera65/chconf.h14
-rw-r--r--keyboards/cannonkeys/db60/chconf.h14
-rw-r--r--keyboards/cannonkeys/devastatingtkl/chconf.h14
-rw-r--r--keyboards/cannonkeys/instant60/chconf.h14
-rw-r--r--keyboards/cannonkeys/instant65/chconf.h14
-rw-r--r--keyboards/cannonkeys/iron165/chconf.h14
-rw-r--r--keyboards/cannonkeys/obliterated75/chconf.h14
-rw-r--r--keyboards/cannonkeys/onyx/chconf.h2
-rw-r--r--keyboards/cannonkeys/ortho48/chconf.h12
-rw-r--r--keyboards/cannonkeys/ortho60/chconf.h12
-rw-r--r--keyboards/cannonkeys/ortho75/chconf.h12
-rw-r--r--keyboards/cannonkeys/practice60/chconf.h12
-rw-r--r--keyboards/cannonkeys/practice65/chconf.h12
-rw-r--r--keyboards/cannonkeys/rekt1800/chconf.h14
-rw-r--r--keyboards/cannonkeys/sagittarius/chconf.h2
-rw-r--r--keyboards/cannonkeys/satisfaction75/chconf.h14
-rw-r--r--keyboards/cannonkeys/savage65/chconf.h14
-rw-r--r--keyboards/cannonkeys/tmov2/chconf.h14
-rw-r--r--keyboards/cannonkeys/tsukuyomi/chconf.h14
-rw-r--r--keyboards/cheshire/curiosity/chconf.h12
-rw-r--r--keyboards/coarse/cordillera/chconf.h12
-rw-r--r--keyboards/converter/siemens_tastatur/chconf.h12
-rw-r--r--keyboards/cutie_club/borsdorf/chconf.h2
-rw-r--r--keyboards/dekunukem/duckypad/chconf.h12
-rw-r--r--keyboards/ebastler/isometria_75/rev1/chconf.h35
-rw-r--r--keyboards/ebastler/isometria_75/rev1/halconf.h31
-rw-r--r--keyboards/ergodox_infinity/chconf.h3
-rw-r--r--keyboards/ergodox_stm32/chconf.h4
-rw-r--r--keyboards/function96/chconf.h14
-rw-r--r--keyboards/geekboards/macropad_v2/chconf.h14
-rw-r--r--keyboards/generic_panda/panda65_01/chconf.h14
-rw-r--r--keyboards/handwired/ck4x4/chconf.h14
-rw-r--r--keyboards/handwired/onekey/blackpill_f401/chconf.h4
-rw-r--r--keyboards/handwired/onekey/blackpill_f401/halconf.h32
-rw-r--r--keyboards/handwired/onekey/blackpill_f411/chconf.h4
-rw-r--r--keyboards/handwired/onekey/blackpill_f411/halconf.h32
-rw-r--r--keyboards/handwired/onekey/bluepill/chconf.h12
-rw-r--r--keyboards/handwired/onekey/stm32f0_disco/chconf.h14
-rw-r--r--keyboards/handwired/onekey/teensy_32/chconf.h6
-rw-r--r--keyboards/handwired/onekey/teensy_lc/chconf.h6
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/chconf.h4
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/halconf.h32
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/chconf.h4
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/halconf.h32
-rw-r--r--keyboards/handwired/pill60/bluepill/chconf.h12
-rw-r--r--keyboards/handwired/riblee_f401/chconf.h4
-rw-r--r--keyboards/handwired/riblee_f411/chconf.h4
-rw-r--r--keyboards/handwired/riblee_f411/halconf.h31
-rw-r--r--keyboards/handwired/sono1/chconf.h12
-rw-r--r--keyboards/handwired/t111/chconf.h12
-rw-r--r--keyboards/handwired/twadlee/tp69/chconf.h6
-rw-r--r--keyboards/handwired/z150/chconf.h12
-rw-r--r--keyboards/hub20/chconf.h2
-rw-r--r--keyboards/iron180/chconf.h12
-rw-r--r--keyboards/jm60/chconf.h4
-rw-r--r--keyboards/keebio/bdn9/rev2/chconf.h14
-rw-r--r--keyboards/keebio/choconum/chconf.h14
-rw-r--r--keyboards/matrix/m20add/chconf.h4
-rw-r--r--keyboards/matrix/noah/chconf.h4
-rw-r--r--keyboards/misterknife/knife66/chconf.h14
-rw-r--r--keyboards/misterknife/knife66_iso/chconf.h14
-rw-r--r--keyboards/nebula12/chconf.h14
-rw-r--r--keyboards/nemui/chconf.h14
-rw-r--r--keyboards/nibiria/stream15/chconf.h2
-rw-r--r--keyboards/nightingale_studios/hailey/chconf.h19
-rw-r--r--keyboards/nightingale_studios/hailey/halconf.h26
-rw-r--r--keyboards/planck/rev6/chconf.h18
-rw-r--r--keyboards/primekb/meridian/chconf.h14
-rw-r--r--keyboards/projectkb/alice/chconf.h14
-rw-r--r--keyboards/projectkb/signature87/chconf.h14
-rw-r--r--keyboards/ramonimbao/squishy65/chconf.h14
-rw-r--r--keyboards/ramonimbao/wete/chconf.h14
-rw-r--r--keyboards/rart/rartlice/chconf.h12
-rw-r--r--keyboards/retro_75/chconf.h12
-rw-r--r--keyboards/rocketboard_16/chconf.h12
-rw-r--r--keyboards/satt/vision/chconf.h14
-rw-r--r--keyboards/technika/chconf.h12
-rw-r--r--keyboards/tkc/godspeed75/chconf.h14
-rw-r--r--keyboards/tkw/stoutgat/v2/f411/chconf.h25
-rw-r--r--keyboards/viktus/styrka/chconf.h14
-rw-r--r--keyboards/westfoxtrot/prophet/chconf.h14
-rw-r--r--keyboards/whitefox/chconf.h3
-rw-r--r--keyboards/wolfmarkclub/wm1/chconf.h12
-rw-r--r--keyboards/xelus/kangaroo/chconf.h14
-rw-r--r--keyboards/xelus/trinityxttkl/chconf.h14
-rw-r--r--keyboards/xelus/valor_frl_tkl/chconf.h14
-rw-r--r--keyboards/xiaomi/mk02/chconf.h2
-rw-r--r--keyboards/zoo/wampus/chconf.h12
-rw-r--r--keyboards/zvecr/split_blackpill/chconf.h12
-rw-r--r--lib/python/qmk/cli/chibios/confmigrate.py7
102 files changed, 158 insertions, 1140 deletions
diff --git a/keyboards/acheron/arctic/chconf.h b/keyboards/acheron/arctic/chconf.h
index 1be94008bf..438ec8ec3f 100644
--- a/keyboards/acheron/arctic/chconf.h
+++ b/keyboards/acheron/arctic/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/acheron/austin/chconf.h b/keyboards/acheron/austin/chconf.h
index 08567482d5..35fb883183 100644
--- a/keyboards/acheron/austin/chconf.h
+++ b/keyboards/acheron/austin/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/acheron/keebspcb/chconf.h b/keyboards/acheron/keebspcb/chconf.h
index c34640ac02..6801ae9a53 100644
--- a/keyboards/acheron/keebspcb/chconf.h
+++ b/keyboards/acheron/keebspcb/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/acheron/lasgweloth/chconf.h b/keyboards/acheron/lasgweloth/chconf.h
index a972edf03c..94e724a1f2 100644
--- a/keyboards/acheron/lasgweloth/chconf.h
+++ b/keyboards/acheron/lasgweloth/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/aeboards/ext65/rev2/chconf.h b/keyboards/aeboards/ext65/rev2/chconf.h
index 4726901050..5af0aad345 100644
--- a/keyboards/aeboards/ext65/rev2/chconf.h
+++ b/keyboards/aeboards/ext65/rev2/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/ai03/vega/chconf.h b/keyboards/ai03/vega/chconf.h
index 2e0092e3e5..822691e22d 100644
--- a/keyboards/ai03/vega/chconf.h
+++ b/keyboards/ai03/vega/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/akegata_denki/device_one/chconf.h b/keyboards/akegata_denki/device_one/chconf.h
index d96371e05b..f2cad98952 100644
--- a/keyboards/akegata_denki/device_one/chconf.h
+++ b/keyboards/akegata_denki/device_one/chconf.h
@@ -33,8 +33,6 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_MEMPOOLS TRUE
@@ -45,8 +43,6 @@
#define CH_CFG_USE_DYNAMIC TRUE
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/at_at/660m/chconf.h b/keyboards/at_at/660m/chconf.h
index 672c3e44c3..49649adb34 100644
--- a/keyboards/at_at/660m/chconf.h
+++ b/keyboards/at_at/660m/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/box75/chconf.h b/keyboards/box75/chconf.h
index ca99ad8ccd..769b29f22c 100644
--- a/keyboards/box75/chconf.h
+++ b/keyboards/box75/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/bt66tech/bt66tech60/chconf.h b/keyboards/bt66tech/bt66tech60/chconf.h
index b0d978988f..93c4ebe405 100644
--- a/keyboards/bt66tech/bt66tech60/chconf.h
+++ b/keyboards/bt66tech/bt66tech60/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/an_c/chconf.h b/keyboards/cannonkeys/an_c/chconf.h
index 81ebe98fc4..0f07a8ba95 100644
--- a/keyboards/cannonkeys/an_c/chconf.h
+++ b/keyboards/cannonkeys/an_c/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/atlas/chconf.h b/keyboards/cannonkeys/atlas/chconf.h
index e4692d9dff..1b3da00c02 100644
--- a/keyboards/cannonkeys/atlas/chconf.h
+++ b/keyboards/cannonkeys/atlas/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/chimera65/chconf.h b/keyboards/cannonkeys/chimera65/chconf.h
index de89ae272b..644ca1c1c3 100644
--- a/keyboards/cannonkeys/chimera65/chconf.h
+++ b/keyboards/cannonkeys/chimera65/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/db60/chconf.h b/keyboards/cannonkeys/db60/chconf.h
index 0df06ecc12..9f541944f8 100644
--- a/keyboards/cannonkeys/db60/chconf.h
+++ b/keyboards/cannonkeys/db60/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/devastatingtkl/chconf.h b/keyboards/cannonkeys/devastatingtkl/chconf.h
index cc63adc45d..677ee1388f 100644
--- a/keyboards/cannonkeys/devastatingtkl/chconf.h
+++ b/keyboards/cannonkeys/devastatingtkl/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/instant60/chconf.h b/keyboards/cannonkeys/instant60/chconf.h
index 8c40cd8082..ac649b27db 100644
--- a/keyboards/cannonkeys/instant60/chconf.h
+++ b/keyboards/cannonkeys/instant60/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/instant65/chconf.h b/keyboards/cannonkeys/instant65/chconf.h
index c82db10415..91f1ae9c08 100644
--- a/keyboards/cannonkeys/instant65/chconf.h
+++ b/keyboards/cannonkeys/instant65/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/iron165/chconf.h b/keyboards/cannonkeys/iron165/chconf.h
index 69a54bbbb3..7c6af767fa 100644
--- a/keyboards/cannonkeys/iron165/chconf.h
+++ b/keyboards/cannonkeys/iron165/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/obliterated75/chconf.h b/keyboards/cannonkeys/obliterated75/chconf.h
index 62dc907321..645412d47c 100644
--- a/keyboards/cannonkeys/obliterated75/chconf.h
+++ b/keyboards/cannonkeys/obliterated75/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/onyx/chconf.h b/keyboards/cannonkeys/onyx/chconf.h
index 61e5dcb6ab..40aa1fd9ba 100644
--- a/keyboards/cannonkeys/onyx/chconf.h
+++ b/keyboards/cannonkeys/onyx/chconf.h
@@ -37,7 +37,5 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/ortho48/chconf.h b/keyboards/cannonkeys/ortho48/chconf.h
index a6d89716c2..583eb9febf 100644
--- a/keyboards/cannonkeys/ortho48/chconf.h
+++ b/keyboards/cannonkeys/ortho48/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/ortho60/chconf.h b/keyboards/cannonkeys/ortho60/chconf.h
index c9bc54b433..ae16c0f747 100644
--- a/keyboards/cannonkeys/ortho60/chconf.h
+++ b/keyboards/cannonkeys/ortho60/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/ortho75/chconf.h b/keyboards/cannonkeys/ortho75/chconf.h
index 512dd7e5f3..2bf13952d9 100644
--- a/keyboards/cannonkeys/ortho75/chconf.h
+++ b/keyboards/cannonkeys/ortho75/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/practice60/chconf.h b/keyboards/cannonkeys/practice60/chconf.h
index 4263e4a41f..ddf9c24df7 100644
--- a/keyboards/cannonkeys/practice60/chconf.h
+++ b/keyboards/cannonkeys/practice60/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/practice65/chconf.h b/keyboards/cannonkeys/practice65/chconf.h
index ecf0d04612..0f412cfbf4 100644
--- a/keyboards/cannonkeys/practice65/chconf.h
+++ b/keyboards/cannonkeys/practice65/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/rekt1800/chconf.h b/keyboards/cannonkeys/rekt1800/chconf.h
index 63148d5ce8..6df38c6527 100644
--- a/keyboards/cannonkeys/rekt1800/chconf.h
+++ b/keyboards/cannonkeys/rekt1800/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/sagittarius/chconf.h b/keyboards/cannonkeys/sagittarius/chconf.h
index de42fc7db9..f94932c6e7 100644
--- a/keyboards/cannonkeys/sagittarius/chconf.h
+++ b/keyboards/cannonkeys/sagittarius/chconf.h
@@ -37,7 +37,5 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/satisfaction75/chconf.h b/keyboards/cannonkeys/satisfaction75/chconf.h
index fffb7a9053..ca4a976c27 100644
--- a/keyboards/cannonkeys/satisfaction75/chconf.h
+++ b/keyboards/cannonkeys/satisfaction75/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/savage65/chconf.h b/keyboards/cannonkeys/savage65/chconf.h
index 8329725a74..f3eb1c05e5 100644
--- a/keyboards/cannonkeys/savage65/chconf.h
+++ b/keyboards/cannonkeys/savage65/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/tmov2/chconf.h b/keyboards/cannonkeys/tmov2/chconf.h
index 4830d0b279..6cc4e27c10 100644
--- a/keyboards/cannonkeys/tmov2/chconf.h
+++ b/keyboards/cannonkeys/tmov2/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cannonkeys/tsukuyomi/chconf.h b/keyboards/cannonkeys/tsukuyomi/chconf.h
index e6cdb87631..7239dcafc8 100644
--- a/keyboards/cannonkeys/tsukuyomi/chconf.h
+++ b/keyboards/cannonkeys/tsukuyomi/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cheshire/curiosity/chconf.h b/keyboards/cheshire/curiosity/chconf.h
index 2782412be3..daed31812b 100644
--- a/keyboards/cheshire/curiosity/chconf.h
+++ b/keyboards/cheshire/curiosity/chconf.h
@@ -25,20 +25,8 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/coarse/cordillera/chconf.h b/keyboards/coarse/cordillera/chconf.h
index 60aebdea10..4f9d43325f 100644
--- a/keyboards/coarse/cordillera/chconf.h
+++ b/keyboards/coarse/cordillera/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/converter/siemens_tastatur/chconf.h b/keyboards/converter/siemens_tastatur/chconf.h
index 2253cfab15..eed5776e77 100644
--- a/keyboards/converter/siemens_tastatur/chconf.h
+++ b/keyboards/converter/siemens_tastatur/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/cutie_club/borsdorf/chconf.h b/keyboards/cutie_club/borsdorf/chconf.h
index c5242220b8..7005cf2340 100644
--- a/keyboards/cutie_club/borsdorf/chconf.h
+++ b/keyboards/cutie_club/borsdorf/chconf.h
@@ -37,7 +37,5 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#include_next <chconf.h>
diff --git a/keyboards/dekunukem/duckypad/chconf.h b/keyboards/dekunukem/duckypad/chconf.h
index f23a911149..2d1b7a3bf4 100644
--- a/keyboards/dekunukem/duckypad/chconf.h
+++ b/keyboards/dekunukem/duckypad/chconf.h
@@ -25,20 +25,8 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/ebastler/isometria_75/rev1/chconf.h b/keyboards/ebastler/isometria_75/rev1/chconf.h
index 58a9736f12..1716aa6cca 100644
--- a/keyboards/ebastler/isometria_75/rev1/chconf.h
+++ b/keyboards/ebastler/isometria_75/rev1/chconf.h
@@ -1,22 +1,29 @@
-/* Copyright 2020 Moritz Plattner (ebastler)
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/ebastler/isometria_75/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
#pragma once
-/* Change system timer resolution, because TIM2 and TIM3 are different */
-#define CH_CFG_ST_RESOLUTION 16
-#define CH_CFG_INTERVALS_SIZE 16
+#define CH_CFG_ST_RESOLUTION 16
+
+#define CH_CFG_INTERVALS_SIZE 16
#include_next <chconf.h>
+
diff --git a/keyboards/ebastler/isometria_75/rev1/halconf.h b/keyboards/ebastler/isometria_75/rev1/halconf.h
index 463f9accbf..6fbac77afb 100644
--- a/keyboards/ebastler/isometria_75/rev1/halconf.h
+++ b/keyboards/ebastler/isometria_75/rev1/halconf.h
@@ -1,20 +1,27 @@
-/* Copyright 2020 Moritz Plattner (ebastler)
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/ebastler/isometria_75/rev1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
#pragma once
#define HAL_USE_PWM TRUE
-#include_next <halconf.h> \ No newline at end of file
+#include_next <halconf.h>
+
diff --git a/keyboards/ergodox_infinity/chconf.h b/keyboards/ergodox_infinity/chconf.h
index d3860afbe0..710d8aa437 100644
--- a/keyboards/ergodox_infinity/chconf.h
+++ b/keyboards/ergodox_infinity/chconf.h
@@ -29,10 +29,9 @@
#define CH_CFG_USE_WAITEXIT TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_DYNAMIC TRUE
#include_next <chconf.h>
+
diff --git a/keyboards/ergodox_stm32/chconf.h b/keyboards/ergodox_stm32/chconf.h
index e9f16c880e..bc3672f6f7 100644
--- a/keyboards/ergodox_stm32/chconf.h
+++ b/keyboards/ergodox_stm32/chconf.h
@@ -35,8 +35,6 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
#define CH_CFG_USE_DYNAMIC TRUE
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/function96/chconf.h b/keyboards/function96/chconf.h
index 521da596f1..c8e4b98ad2 100644
--- a/keyboards/function96/chconf.h
+++ b/keyboards/function96/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/geekboards/macropad_v2/chconf.h b/keyboards/geekboards/macropad_v2/chconf.h
index aec4640192..13cb5645d9 100644
--- a/keyboards/geekboards/macropad_v2/chconf.h
+++ b/keyboards/geekboards/macropad_v2/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/generic_panda/panda65_01/chconf.h b/keyboards/generic_panda/panda65_01/chconf.h
index b53557576f..847f2cc284 100644
--- a/keyboards/generic_panda/panda65_01/chconf.h
+++ b/keyboards/generic_panda/panda65_01/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/ck4x4/chconf.h b/keyboards/handwired/ck4x4/chconf.h
index 13281bd768..524edbe8fd 100644
--- a/keyboards/handwired/ck4x4/chconf.h
+++ b/keyboards/handwired/ck4x4/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/onekey/blackpill_f401/chconf.h b/keyboards/handwired/onekey/blackpill_f401/chconf.h
index 69b87423ad..de4ab83ec3 100644
--- a/keyboards/handwired/onekey/blackpill_f401/chconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/chconf.h
@@ -23,10 +23,6 @@
#define CH_CFG_ST_FREQUENCY 10000
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f401/halconf.h b/keyboards/handwired/onekey/blackpill_f401/halconf.h
index ae08512d49..878879db1e 100644
--- a/keyboards/handwired/onekey/blackpill_f401/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
#pragma once
#define HAL_USE_I2C TRUE
+
#define HAL_USE_PWM TRUE
-#include_next "halconf.h"
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/onekey/blackpill_f411/chconf.h b/keyboards/handwired/onekey/blackpill_f411/chconf.h
index aa3372fc39..4ecd0f52a2 100644
--- a/keyboards/handwired/onekey/blackpill_f411/chconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/chconf.h
@@ -23,10 +23,6 @@
#define CH_CFG_ST_FREQUENCY 10000
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411/halconf.h b/keyboards/handwired/onekey/blackpill_f411/halconf.h
index ae08512d49..d54f2a26ac 100644
--- a/keyboards/handwired/onekey/blackpill_f411/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
#pragma once
#define HAL_USE_I2C TRUE
+
#define HAL_USE_PWM TRUE
-#include_next "halconf.h"
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/onekey/bluepill/chconf.h b/keyboards/handwired/onekey/bluepill/chconf.h
index 46d8af4a8a..c7a982aedd 100644
--- a/keyboards/handwired/onekey/bluepill/chconf.h
+++ b/keyboards/handwired/onekey/bluepill/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/onekey/stm32f0_disco/chconf.h b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
index cfec50b6e0..33ceb1431e 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/chconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/onekey/teensy_32/chconf.h b/keyboards/handwired/onekey/teensy_32/chconf.h
index c80efff693..199e8d05bd 100644
--- a/keyboards/handwired/onekey/teensy_32/chconf.h
+++ b/keyboards/handwired/onekey/teensy_32/chconf.h
@@ -27,12 +27,6 @@
#define CH_CFG_TIME_QUANTUM 20
-#define CH_CFG_USE_TM FALSE
-
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/onekey/teensy_lc/chconf.h b/keyboards/handwired/onekey/teensy_lc/chconf.h
index 5be02963ca..cfcced3cf7 100644
--- a/keyboards/handwired/onekey/teensy_lc/chconf.h
+++ b/keyboards/handwired/onekey/teensy_lc/chconf.h
@@ -27,12 +27,6 @@
#define CH_CFG_TIME_QUANTUM 20
-#define CH_CFG_USE_TM FALSE
-
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f401/chconf.h b/keyboards/handwired/pill60/blackpill_f401/chconf.h
index 1664f045c5..c10f1f287a 100644
--- a/keyboards/handwired/pill60/blackpill_f401/chconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/chconf.h
@@ -23,10 +23,6 @@
#define CH_CFG_ST_FREQUENCY 10000
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f401/halconf.h b/keyboards/handwired/pill60/blackpill_f401/halconf.h
index f1230634b6..1e126a8656 100644
--- a/keyboards/handwired/pill60/blackpill_f401/halconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/handwired/pill60/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
#pragma once
#define HAL_USE_I2C TRUE
+
#define HAL_USE_PWM TRUE
-#include_next "halconf.h" \ No newline at end of file
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/pill60/blackpill_f411/chconf.h b/keyboards/handwired/pill60/blackpill_f411/chconf.h
index 01a052754c..fb7536cebb 100644
--- a/keyboards/handwired/pill60/blackpill_f411/chconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/chconf.h
@@ -23,10 +23,6 @@
#define CH_CFG_ST_FREQUENCY 10000
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f411/halconf.h b/keyboards/handwired/pill60/blackpill_f411/halconf.h
index f1230634b6..435bf3274e 100644
--- a/keyboards/handwired/pill60/blackpill_f411/halconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/handwired/pill60/blackpill_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
#pragma once
#define HAL_USE_I2C TRUE
+
#define HAL_USE_PWM TRUE
-#include_next "halconf.h" \ No newline at end of file
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/pill60/bluepill/chconf.h b/keyboards/handwired/pill60/bluepill/chconf.h
index 883ab46d10..c92d2a276d 100644
--- a/keyboards/handwired/pill60/bluepill/chconf.h
+++ b/keyboards/handwired/pill60/bluepill/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/riblee_f401/chconf.h b/keyboards/handwired/riblee_f401/chconf.h
index 275f2b876c..3b48fc5cdf 100644
--- a/keyboards/handwired/riblee_f401/chconf.h
+++ b/keyboards/handwired/riblee_f401/chconf.h
@@ -23,10 +23,6 @@
#define CH_CFG_ST_FREQUENCY 10000
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/riblee_f411/chconf.h b/keyboards/handwired/riblee_f411/chconf.h
index 7c20b34e7d..36199f6497 100644
--- a/keyboards/handwired/riblee_f411/chconf.h
+++ b/keyboards/handwired/riblee_f411/chconf.h
@@ -23,10 +23,6 @@
#define CH_CFG_ST_FREQUENCY 10000
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/riblee_f411/halconf.h b/keyboards/handwired/riblee_f411/halconf.h
index d65408a1b6..6084293ff1 100644
--- a/keyboards/handwired/riblee_f411/halconf.h
+++ b/keyboards/handwired/riblee_f411/halconf.h
@@ -1,20 +1,27 @@
-/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
+/* Copyright 2020 QMK
*
- * 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 3 of the License, or
- * (at your option) any later version.
+ * 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.
+ * 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 <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/handwired/riblee_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
#pragma once
#define HAL_USE_I2C TRUE
-#include_next "halconf.h"
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/sono1/chconf.h b/keyboards/handwired/sono1/chconf.h
index 256dd73f9f..f2330f083c 100644
--- a/keyboards/handwired/sono1/chconf.h
+++ b/keyboards/handwired/sono1/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/t111/chconf.h b/keyboards/handwired/t111/chconf.h
index 3dae797c7f..962653ec4c 100644
--- a/keyboards/handwired/t111/chconf.h
+++ b/keyboards/handwired/t111/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/handwired/twadlee/tp69/chconf.h b/keyboards/handwired/twadlee/tp69/chconf.h
index d955082ae1..6b35146c74 100644
--- a/keyboards/handwired/twadlee/tp69/chconf.h
+++ b/keyboards/handwired/twadlee/tp69/chconf.h
@@ -27,12 +27,6 @@
#define CH_CFG_TIME_QUANTUM 20
-#define CH_CFG_USE_TM FALSE
-
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/z150/chconf.h b/keyboards/handwired/z150/chconf.h
index 54f9e834f1..975667df0e 100644
--- a/keyboards/handwired/z150/chconf.h
+++ b/keyboards/handwired/z150/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/hub20/chconf.h b/keyboards/hub20/chconf.h
index 5e08a4a7a5..3ac1345068 100644
--- a/keyboards/hub20/chconf.h
+++ b/keyboards/hub20/chconf.h
@@ -37,7 +37,5 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#include_next <chconf.h>
diff --git a/keyboards/iron180/chconf.h b/keyboards/iron180/chconf.h
index 1218c8905b..1a57dca36b 100644
--- a/keyboards/iron180/chconf.h
+++ b/keyboards/iron180/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/jm60/chconf.h b/keyboards/jm60/chconf.h
index 4f28655fc5..5bceae30ab 100644
--- a/keyboards/jm60/chconf.h
+++ b/keyboards/jm60/chconf.h
@@ -35,8 +35,6 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
#define CH_CFG_USE_DYNAMIC TRUE
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/keebio/bdn9/rev2/chconf.h b/keyboards/keebio/bdn9/rev2/chconf.h
index 98c1cdf54a..7b1933eb1a 100644
--- a/keyboards/keebio/bdn9/rev2/chconf.h
+++ b/keyboards/keebio/bdn9/rev2/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/keebio/choconum/chconf.h b/keyboards/keebio/choconum/chconf.h
index 262aa58070..350362ccb7 100644
--- a/keyboards/keebio/choconum/chconf.h
+++ b/keyboards/keebio/choconum/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/matrix/m20add/chconf.h b/keyboards/matrix/m20add/chconf.h
index e1f154b1ea..b2c8dec67f 100644
--- a/keyboards/matrix/m20add/chconf.h
+++ b/keyboards/matrix/m20add/chconf.h
@@ -35,8 +35,6 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
#define CH_CFG_USE_DYNAMIC TRUE
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/matrix/noah/chconf.h b/keyboards/matrix/noah/chconf.h
index ccf619fdca..94fe5f197c 100644
--- a/keyboards/matrix/noah/chconf.h
+++ b/keyboards/matrix/noah/chconf.h
@@ -35,8 +35,6 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
#define CH_CFG_USE_DYNAMIC TRUE
-#define CH_CFG_USE_FACTORY FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/misterknife/knife66/chconf.h b/keyboards/misterknife/knife66/chconf.h
index b19c80a7ba..58f2142ae1 100644
--- a/keyboards/misterknife/knife66/chconf.h
+++ b/keyboards/misterknife/knife66/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/misterknife/knife66_iso/chconf.h b/keyboards/misterknife/knife66_iso/chconf.h
index 1d83a67128..d1fc8e1532 100644
--- a/keyboards/misterknife/knife66_iso/chconf.h
+++ b/keyboards/misterknife/knife66_iso/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/nebula12/chconf.h b/keyboards/nebula12/chconf.h
index e34e007fe8..51c2e75712 100644
--- a/keyboards/nebula12/chconf.h
+++ b/keyboards/nebula12/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/nemui/chconf.h b/keyboards/nemui/chconf.h
index 2e6e17f1aa..4ee4034139 100644
--- a/keyboards/nemui/chconf.h
+++ b/keyboards/nemui/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/nibiria/stream15/chconf.h b/keyboards/nibiria/stream15/chconf.h
index 257bb696a8..44b49fc393 100644
--- a/keyboards/nibiria/stream15/chconf.h
+++ b/keyboards/nibiria/stream15/chconf.h
@@ -37,7 +37,5 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#include_next <chconf.h>
diff --git a/keyboards/nightingale_studios/hailey/chconf.h b/keyboards/nightingale_studios/hailey/chconf.h
deleted file mode 100644
index 6d2fa97348..0000000000
--- a/keyboards/nightingale_studios/hailey/chconf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 zvecr<git@zvecr.com>
-
-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/>.
-*/
-
-#define CH_CFG_USE_TM FALSE
-#include_next "chconf.h" \ No newline at end of file
diff --git a/keyboards/nightingale_studios/hailey/halconf.h b/keyboards/nightingale_studios/hailey/halconf.h
deleted file mode 100644
index 8e3818ea21..0000000000
--- a/keyboards/nightingale_studios/hailey/halconf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 zvecr<git@zvecr.com>
-
-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
-
-#define HAL_USE_I2C FALSE
-#define HAL_USE_PWM FALSE
-#define HAL_USE_SPI FALSE
-#define HAL_USE_GPT FALSE
-#define HAL_USE_PWM FALSE
-#define HAL_USE_DAC FALSE
-
-#include_next "halconf.h"
diff --git a/keyboards/planck/rev6/chconf.h b/keyboards/planck/rev6/chconf.h
index 0298c11c40..e1243f23ec 100644
--- a/keyboards/planck/rev6/chconf.h
+++ b/keyboards/planck/rev6/chconf.h
@@ -1,8 +1,8 @@
-/* Copyright 2020 QMK Contributors
+/* Copyright 2020 QMK
*
* 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 3 of the License, or
+ * 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,
@@ -14,8 +14,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303
-// so we need to change resolution and frequency to match.
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/planck/rev6/chconf.h -r platforms/chibios/QMK_PROTON_C/configs/chconf.h`
+ */
+
+#pragma once
+
#define CH_CFG_ST_RESOLUTION 16
+
#define CH_CFG_ST_FREQUENCY 10000
-#include_next "chconf.h"
+
+#include_next <chconf.h>
+
diff --git a/keyboards/primekb/meridian/chconf.h b/keyboards/primekb/meridian/chconf.h
index 44182595b0..c5beb2df12 100644
--- a/keyboards/primekb/meridian/chconf.h
+++ b/keyboards/primekb/meridian/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/projectkb/alice/chconf.h b/keyboards/projectkb/alice/chconf.h
index 72266cbbb4..2dfe6f0be0 100644
--- a/keyboards/projectkb/alice/chconf.h
+++ b/keyboards/projectkb/alice/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/projectkb/signature87/chconf.h b/keyboards/projectkb/signature87/chconf.h
index 2b6da6c973..2de08dea33 100644
--- a/keyboards/projectkb/signature87/chconf.h
+++ b/keyboards/projectkb/signature87/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/ramonimbao/squishy65/chconf.h b/keyboards/ramonimbao/squishy65/chconf.h
index f9146fe52f..144f324bc5 100644
--- a/keyboards/ramonimbao/squishy65/chconf.h
+++ b/keyboards/ramonimbao/squishy65/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/ramonimbao/wete/chconf.h b/keyboards/ramonimbao/wete/chconf.h
index 523ffe4606..18befdb8e1 100644
--- a/keyboards/ramonimbao/wete/chconf.h
+++ b/keyboards/ramonimbao/wete/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/rart/rartlice/chconf.h b/keyboards/rart/rartlice/chconf.h
index 5c06b72c88..0a89eb248c 100644
--- a/keyboards/rart/rartlice/chconf.h
+++ b/keyboards/rart/rartlice/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/retro_75/chconf.h b/keyboards/retro_75/chconf.h
index 2245de22d1..b42ecdbb09 100644
--- a/keyboards/retro_75/chconf.h
+++ b/keyboards/retro_75/chconf.h
@@ -25,20 +25,8 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/rocketboard_16/chconf.h b/keyboards/rocketboard_16/chconf.h
index 6b6a8526c0..4fbe44bd1d 100644
--- a/keyboards/rocketboard_16/chconf.h
+++ b/keyboards/rocketboard_16/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/satt/vision/chconf.h b/keyboards/satt/vision/chconf.h
index 8ea62c9768..21cc2cee61 100644
--- a/keyboards/satt/vision/chconf.h
+++ b/keyboards/satt/vision/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/technika/chconf.h b/keyboards/technika/chconf.h
index eabb44a1f8..4cab3f93f5 100644
--- a/keyboards/technika/chconf.h
+++ b/keyboards/technika/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/tkc/godspeed75/chconf.h b/keyboards/tkc/godspeed75/chconf.h
index 1c2fed2287..c341c6fba4 100644
--- a/keyboards/tkc/godspeed75/chconf.h
+++ b/keyboards/tkc/godspeed75/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/tkw/stoutgat/v2/f411/chconf.h b/keyboards/tkw/stoutgat/v2/f411/chconf.h
deleted file mode 100644
index be287db09a..0000000000
--- a/keyboards/tkw/stoutgat/v2/f411/chconf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/tkw/stoutgat/v2/f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#include_next <chconf.h>
-
diff --git a/keyboards/viktus/styrka/chconf.h b/keyboards/viktus/styrka/chconf.h
index 76d16808a7..0f68479a06 100644
--- a/keyboards/viktus/styrka/chconf.h
+++ b/keyboards/viktus/styrka/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/westfoxtrot/prophet/chconf.h b/keyboards/westfoxtrot/prophet/chconf.h
index 6a1f54a274..d2cc7a7c42 100644
--- a/keyboards/westfoxtrot/prophet/chconf.h
+++ b/keyboards/westfoxtrot/prophet/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/whitefox/chconf.h b/keyboards/whitefox/chconf.h
index 1860897bb0..d220eec49b 100644
--- a/keyboards/whitefox/chconf.h
+++ b/keyboards/whitefox/chconf.h
@@ -29,10 +29,9 @@
#define CH_CFG_USE_WAITEXIT TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_DYNAMIC TRUE
#include_next <chconf.h>
+
diff --git a/keyboards/wolfmarkclub/wm1/chconf.h b/keyboards/wolfmarkclub/wm1/chconf.h
index d4d8b46ae0..41c38c33e4 100644
--- a/keyboards/wolfmarkclub/wm1/chconf.h
+++ b/keyboards/wolfmarkclub/wm1/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/xelus/kangaroo/chconf.h b/keyboards/xelus/kangaroo/chconf.h
index 886a896796..71b34b0591 100644
--- a/keyboards/xelus/kangaroo/chconf.h
+++ b/keyboards/xelus/kangaroo/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/xelus/trinityxttkl/chconf.h b/keyboards/xelus/trinityxttkl/chconf.h
index 1d1191ca18..6dec71d667 100644
--- a/keyboards/xelus/trinityxttkl/chconf.h
+++ b/keyboards/xelus/trinityxttkl/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/xelus/valor_frl_tkl/chconf.h b/keyboards/xelus/valor_frl_tkl/chconf.h
index d30ea0bfe0..5b1d65cb74 100644
--- a/keyboards/xelus/valor_frl_tkl/chconf.h
+++ b/keyboards/xelus/valor_frl_tkl/chconf.h
@@ -25,21 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/xiaomi/mk02/chconf.h b/keyboards/xiaomi/mk02/chconf.h
index 28defbc877..54f9eb7c2d 100644
--- a/keyboards/xiaomi/mk02/chconf.h
+++ b/keyboards/xiaomi/mk02/chconf.h
@@ -37,8 +37,6 @@
#define CH_CFG_USE_MAILBOXES TRUE
-#define CH_CFG_USE_MEMCORE TRUE
-
#define CH_CFG_USE_PIPES TRUE
#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
diff --git a/keyboards/zoo/wampus/chconf.h b/keyboards/zoo/wampus/chconf.h
index 3f64f006f5..9d163f5f03 100644
--- a/keyboards/zoo/wampus/chconf.h
+++ b/keyboards/zoo/wampus/chconf.h
@@ -25,19 +25,7 @@
#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/keyboards/zvecr/split_blackpill/chconf.h b/keyboards/zvecr/split_blackpill/chconf.h
index 7b09e5cb86..e98ee9d790 100644
--- a/keyboards/zvecr/split_blackpill/chconf.h
+++ b/keyboards/zvecr/split_blackpill/chconf.h
@@ -23,19 +23,7 @@
#define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_USE_TM FALSE
-
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
#include_next <chconf.h>
diff --git a/lib/python/qmk/cli/chibios/confmigrate.py b/lib/python/qmk/cli/chibios/confmigrate.py
index 9d25488586..3e348b2b07 100644
--- a/lib/python/qmk/cli/chibios/confmigrate.py
+++ b/lib/python/qmk/cli/chibios/confmigrate.py
@@ -111,6 +111,7 @@ def migrate_mcuconf_h(to_override, outfile):
@cli.argument('-r', '--reference', type=normpath, arg_only=True, help='Specify the reference file to compare against')
@cli.argument('-o', '--overwrite', arg_only=True, action='store_true', help='Overwrites the input file during migration.')
@cli.argument('-d', '--delete', arg_only=True, action='store_true', help='If the file has no overrides, migration will delete the input file.')
+@cli.argument('-f', '--force', arg_only=True, action='store_true', help='Re-migrates an already migrated file, even if it doesn\'t detect a full ChibiOS config.')
@cli.subcommand('Generates a migrated ChibiOS configuration file, as a result of comparing the input against a reference')
def chibios_confmigrate(cli):
"""Generates a usable ChibiOS replacement configuration file, based on a fully-defined conf and a reference config.
@@ -142,19 +143,19 @@ def chibios_confmigrate(cli):
eprint('--------------------------------------')
- if "CHCONF_H" in input_defs["dict"] or "_CHCONF_H_" in input_defs["dict"]:
+ if cli.args.input.name == "chconf.h" and ("CHCONF_H" in input_defs["dict"] or "_CHCONF_H_" in input_defs["dict"] or cli.args.force):
migrate_chconf_h(to_override, outfile=sys.stdout)
if cli.args.overwrite:
with open(cli.args.input, "w") as out_file:
migrate_chconf_h(to_override, outfile=out_file)
- elif "HALCONF_H" in input_defs["dict"] or "_HALCONF_H_" in input_defs["dict"]:
+ elif cli.args.input.name == "halconf.h" and ("HALCONF_H" in input_defs["dict"] or "_HALCONF_H_" in input_defs["dict"] or cli.args.force):
migrate_halconf_h(to_override, outfile=sys.stdout)
if cli.args.overwrite:
with open(cli.args.input, "w") as out_file:
migrate_halconf_h(to_override, outfile=out_file)
- elif "MCUCONF_H" in input_defs["dict"] or "_MCUCONF_H_" in input_defs["dict"]:
+ elif cli.args.input.name == "mcuconf.h" and ("MCUCONF_H" in input_defs["dict"] or "_MCUCONF_H_" in input_defs["dict"] or cli.args.force):
migrate_mcuconf_h(to_override, outfile=sys.stdout)
if cli.args.overwrite:
with open(cli.args.input, "w") as out_file: