ChibiOS conf migrations... take 11 (#11646)

* Allow forcing re-migration. * ChibiOS conf upgrade for acheron/arctic acheron/arctic - 2aedbe9103fff6c37e596c33c9ed337957647368 * ChibiOS conf upgrade for acheron/austin acheron/austin - c2f4e3b7fc9f1c3d64f47d139bc58367afeca1b7 * ChibiOS conf upgrade for acheron/keebspcb acheron/keebspcb - 1ba976e409732bfa5c0487dd33e20bec06852ce4 * ChibiOS conf upgrade for acheron/lasgweloth acheron/lasgweloth - 01a2e70d0d86de0ff05d0b898a6e3b4428ee1581 * ChibiOS conf upgrade for aeboards/ext65/rev2 aeboards/ext65/rev2 - 3c9a45cafb4ed6d9672aaff4548b105193633a87 * ChibiOS conf upgrade for ai03/vega ai03/vega - 1bd0dfccb99baa69bacd2d55f2bfa72019b8bf80 * ChibiOS conf upgrade for akegata_denki/device_one akegata_denki/device_one - a013823188660f5fca37c5763f160f8646aed7a7 * ChibiOS conf upgrade for at_at/660m at_at/660m - 9999583e8bec2772046132a22818482d24e18c84 * ChibiOS conf upgrade for box75 box75 - 1126206109a942237eea96f3a9608e3c9ed55f8e * ChibiOS conf upgrade for bt66tech/bt66tech60 bt66tech/bt66tech60 - b69120638a8b2c86c008fd0592be918383d8a454 * ChibiOS conf upgrade for cannonkeys/an_c cannonkeys/an_c - c755f6caaccbe2b30d95661a3d441b836534c29f * ChibiOS conf upgrade for cannonkeys/atlas cannonkeys/atlas - 1a18c55492a834b82715516ea4cd4d3d94508743 * ChibiOS conf upgrade for cannonkeys/chimera65 cannonkeys/chimera65 - 6bf226ef353da9106c381a8ac95a9b90529327e5 * ChibiOS conf upgrade for cannonkeys/db60 cannonkeys/db60 - 07e3246f8e3adc5b6918809e6a5aa1ad064b9a09 * ChibiOS conf upgrade for cannonkeys/devastatingtkl cannonkeys/devastatingtkl - 907d258e29eb7e35b1f868c1ea6148bfd1e3a3f2 * ChibiOS conf upgrade for cannonkeys/instant60 cannonkeys/instant60 - ac876ff6746b08839a3936dd4126b52683b763f4 * ChibiOS conf upgrade for cannonkeys/instant65 cannonkeys/instant65 - 3b8c89ec5fecbdb35cccb00c45e64a798528dbda * ChibiOS conf upgrade for cannonkeys/iron165 cannonkeys/iron165 - 0814ec4067d9857b0134e38384f272cf7172fb03 * ChibiOS conf upgrade for cannonkeys/obliterated75 cannonkeys/obliterated75 - 0f376e5d9a232c62e9c60f8fdc81d12732352ddc * ChibiOS conf upgrade for cannonkeys/onyx cannonkeys/onyx - d35134ebe09046b91ab176035d3742d80b23ed8e * ChibiOS conf upgrade for cannonkeys/ortho48 cannonkeys/ortho48 - 828dbfbb013ff4fefe75044b3c9fd31fec5e95a1 * ChibiOS conf upgrade for cannonkeys/ortho60 cannonkeys/ortho60 - 2aca4dd4234e0dac828f5fa15ae5b3bc3c0605dc * ChibiOS conf upgrade for cannonkeys/ortho75 cannonkeys/ortho75 - 4af8aaaded0ff53e9c01473f5968cc169f268647 * ChibiOS conf upgrade for cannonkeys/practice60 cannonkeys/practice60 - e01df551d9483eeb3f825fcc453317fe65f674b5 * ChibiOS conf upgrade for cannonkeys/practice65 cannonkeys/practice65 - 156163789d4c96cdd4787895788c1d02a2367f5c * ChibiOS conf upgrade for cannonkeys/rekt1800 cannonkeys/rekt1800 - 15882afb6373dea3e5f7ed13c19744ee2463f3bf * ChibiOS conf upgrade for cannonkeys/sagittarius cannonkeys/sagittarius - f49fee611ffcc02cb3dc7f249fc8c83f136907b9 * ChibiOS conf upgrade for cannonkeys/satisfaction75 cannonkeys/satisfaction75 - 2c9fbbea3a38820774f6ff436ef51017b545475a * ChibiOS conf upgrade for cannonkeys/savage65 cannonkeys/savage65 - ddd764be363c46f3e9b1a16151bd02d8f66b2dd4 * ChibiOS conf upgrade for cannonkeys/tmov2 cannonkeys/tmov2 - 7af36cd2a42015838b77697624e90008ffa72778 * ChibiOS conf upgrade for cannonkeys/tsukuyomi cannonkeys/tsukuyomi - a120bea5dacb2cd6f143458cece46d2860ea196d * ChibiOS conf upgrade for cheshire/curiosity cheshire/curiosity - 93d8fe3b7a8e028d4b015941ee71b50afe86bc8a * ChibiOS conf upgrade for coarse/cordillera coarse/cordillera - 7d986d3f534786f302cbf74a5e6b7e51ffe60093 * ChibiOS conf upgrade for converter/siemens_tastatur converter/siemens_tastatur - 3f79f1467bbc56f284aceafd76ab5c6a1cbb68f4 * ChibiOS conf upgrade for cutie_club/borsdorf cutie_club/borsdorf - f8c6015b7aacfd5edef4f22f719eea30660005e7 * ChibiOS conf upgrade for dekunukem/duckypad dekunukem/duckypad - d9c162d0867d3925cca2e653a3a3870eac2d23d2 * ChibiOS conf upgrade for ebastler/isometria_75/rev1 ebastler/isometria_75/rev1 - 2ecdd00b8c6cc794a7014747185b88374d5766c0 * ChibiOS conf upgrade for ergodox_infinity ergodox_infinity - 76736c701db22e890764481c25bd38badf32a1cf * ChibiOS conf upgrade for ergodox_stm32 ergodox_stm32 - a7bdb0b7822617ca0f9d316a082874ac0fef5964 * ChibiOS conf upgrade for function96 function96 - 1b9e394a86dab24b85d160afe9281b5e7652afe2 * ChibiOS conf upgrade for geekboards/macropad_v2 geekboards/macropad_v2 - de261e46a42cc7b7ff793e26200669f94b1dbb18 * ChibiOS conf upgrade for generic_panda/panda65_01 generic_panda/panda65_01 - 592d2443033875e0309506aa8cb5212389054458 * ChibiOS conf upgrade for handwired/ck4x4 handwired/ck4x4 - 9d7d4af7f2d787afd638e976334cd37c490040d7 * ChibiOS conf upgrade for handwired/onekey/blackpill_f401 handwired/onekey/blackpill_f401 - c9257a30203b3a0e5aa18b35e07281fcd043ab5d * ChibiOS conf upgrade for handwired/onekey/blackpill_f411 handwired/onekey/blackpill_f411 - dfccc2c6b245cfb561faba60c9f3fc7af8c3db30 * ChibiOS conf upgrade for handwired/onekey/bluepill handwired/onekey/bluepill - 393f4b94e9a0fbc9cd00de1acde346ad72250b4a * ChibiOS conf upgrade for handwired/onekey/stm32f0_disco handwired/onekey/stm32f0_disco - d827881f9bed09fd41c7c4e9d066e96b6643a099 * ChibiOS conf upgrade for handwired/onekey/teensy_32 handwired/onekey/teensy_32 - dd90f6c823da80ba43afa41249a2bdbbab98b04c * ChibiOS conf upgrade for handwired/onekey/teensy_lc handwired/onekey/teensy_lc - 34596f2eeb62403cce532d20cf893ebd77fe2d05 * ChibiOS conf upgrade for handwired/pill60/blackpill_f401 handwired/pill60/blackpill_f401 - 20bbccb5058085076357f4fa956eede2c0af86e8 * ChibiOS conf upgrade for handwired/pill60/blackpill_f411 handwired/pill60/blackpill_f411 - e03a4c3ec3b9ba65b8067126a039a8eb2cd10e51 * ChibiOS conf upgrade for handwired/pill60/bluepill handwired/pill60/bluepill - 2fb721fb4376cde2067eed1c0c8acbf3bf5851c3 * ChibiOS conf upgrade for handwired/riblee_f401 handwired/riblee_f401 - 2823cd98d64c91b146dae343a32176d51772952b * ChibiOS conf upgrade for handwired/riblee_f411 handwired/riblee_f411 - 5cf7589c9a11c4ed14e7d28676ac836fbb07d013 * ChibiOS conf upgrade for handwired/sono1 handwired/sono1 - d972acee03efb4917fc42f7d72c0a416b67ebd4a * ChibiOS conf upgrade for handwired/t111 handwired/t111 - f947c1d59025fe04e7d7b999d80e20277be4366c * ChibiOS conf upgrade for handwired/twadlee/tp69 handwired/twadlee/tp69 - 48ab62464ba1f2651f4468cbec7c6058e3b8c158 * ChibiOS conf upgrade for handwired/z150 handwired/z150 - 35e85696845e965d7f2dcdb372ed20c17d42c2bb * ChibiOS conf upgrade for hub20 hub20 - f094036a182169b5a73f89f09f2ccaa3e5fc9e7e * ChibiOS conf upgrade for iron180 iron180 - 5efb6f21c848b3c964795d9debddceac7628933d * ChibiOS conf upgrade for jm60 jm60 - dbbdbe8b27b3c1d0a25981b2f75728d163d5d299 * ChibiOS conf upgrade for keebio/bdn9/rev2 keebio/bdn9/rev2 - 0031632523dddfc8f7b3a02cf9c5990ebbb3856d * ChibiOS conf upgrade for keebio/choconum keebio/choconum - 4484ef6936a497610ca5ae4d378bc07b2bc1b1c7 * ChibiOS conf upgrade for matrix/m20add matrix/m20add - 6068aeff5b14c26de8838180f4397800abe9f1aa * ChibiOS conf upgrade for matrix/noah matrix/noah - fcde175fb1d3f5bf0716ac5a880c2cc9ab4bbf7f * ChibiOS conf upgrade for misterknife/knife66 misterknife/knife66 - e7f3ceffb94fb8e680da2af27fa7cb1a0a52b699 * ChibiOS conf upgrade for misterknife/knife66_iso misterknife/knife66_iso - ee027db939c098f908f70f02ffa9cc3952139f70 * ChibiOS conf upgrade for nebula12 nebula12 - 2f3a25b6675dcd0fabe75e7bb63038d3cac19610 * ChibiOS conf upgrade for nemui nemui - 4030faa372512f766fd747876cb28176302453f9 * ChibiOS conf upgrade for nibiria/stream15 nibiria/stream15 - fd7b09affa208403099ef9bff1b756fac0d4f918 * ChibiOS conf upgrade for nightingale_studios/hailey nightingale_studios/hailey - 496a44b2f789cc59a6110c7c1c41d57e59c722be * ChibiOS conf upgrade for planck/rev6 planck/rev6 - 6fb8f0bc21b4ab774ce3d339fdf6f25d96059f10 * ChibiOS conf upgrade for primekb/meridian primekb/meridian - 8021ed99e8bdf92faab806780186cc924dd59e50 * ChibiOS conf upgrade for projectkb/alice projectkb/alice - ad7678d475a14c54f28b62d1c1b15f5b4c4448bc * ChibiOS conf upgrade for projectkb/signature87 projectkb/signature87 - de61338b0a5c477f39c000df8117dd3017c2643d * ChibiOS conf upgrade for ramonimbao/squishy65 ramonimbao/squishy65 - 2ea1a8b18c39d0e193bbbf5836191874d3aafc53 * ChibiOS conf upgrade for ramonimbao/wete ramonimbao/wete - a80b3b309f06566adcdf20234d81c1d5aa599b00 * ChibiOS conf upgrade for rart/rartlice rart/rartlice - c8c80c302428d62bb8b08e3185509a233a94f5f0 * ChibiOS conf upgrade for retro_75 retro_75 - 7434e266bba43ded8ca1ff75d77faa506473ca91 * ChibiOS conf upgrade for rocketboard_16 rocketboard_16 - 1182a8730a84b58eba5a470286b6db6134d36f54 * ChibiOS conf upgrade for satt/vision satt/vision - c85a28a8d7e321511a17a7e7084d0a7876d1779a * ChibiOS conf upgrade for technika technika - 7c59de348f0ec5f6ac9e260806a87aaf16fbafa2 * ChibiOS conf upgrade for tkc/godspeed75 tkc/godspeed75 - e447b39dca393736fbf289049699d5b4748bb8c6 * ChibiOS conf upgrade for tkw/stoutgat/v2/f411 tkw/stoutgat/v2/f411 - 58e9b909379ad107affbff0508e3923264b75426 * ChibiOS conf upgrade for viktus/styrka viktus/styrka - 36bf0921be79a8b037fdc25343584574a312be60 * ChibiOS conf upgrade for westfoxtrot/prophet westfoxtrot/prophet - 80036c8f986c8d3261d6b0748d2057eccab6430b * ChibiOS conf upgrade for whitefox whitefox - c9eccac0196c3e2e2ea6c90d3036283a3eabff2c * ChibiOS conf upgrade for wolfmarkclub/wm1 wolfmarkclub/wm1 - 0d22a426255b829a7805bd6a3ff927198b1e31b4 * ChibiOS conf upgrade for xelus/kangaroo xelus/kangaroo - fdb1ffb66f4841f662e968929f058d4fd403c97e * ChibiOS conf upgrade for xelus/trinityxttkl xelus/trinityxttkl - a9641e5b39b7bb38351b9109f0f381837b2e8e79 * ChibiOS conf upgrade for xelus/valor_frl_tkl xelus/valor_frl_tkl - 6c3b577852736a68727ec319c30712b3088e65cd * ChibiOS conf upgrade for xiaomi/mk02 xiaomi/mk02 - 4c1406ebfee73551a844ef7ab29fc5788d7e875c * ChibiOS conf upgrade for zoo/wampus zoo/wampus - 930c903e85478e220a235f45593c03512c66bc2a * ChibiOS conf upgrade for zvecr/split_blackpill zvecr/split_blackpill - c0e3e1583262e4cb0ebfe2efa6356ed6c5c957ca
author: Nick Brassel <nick@tzarc.org> 2021-01-21 17:00:53 +1100
committer: GitHub <noreply@github.com> 2021-01-21 17:00:53 +1100
commit: bdb757e189bf72c0ef382a924328642a629e06d5 (patch)
tree: 6497c5fdad5096fa3c66bc05d42a8a222bc66c2b
parent: ea51cbf1d963ac3e4f327bc28ebe69b4bb39bade (diff)
download: qmk_firmware-bdb757e189bf72c0ef382a924328642a629e06d5.tar.gz
qmk_firmware-bdb757e189bf72c0ef382a924328642a629e06d5.zip
102 files changed, 158 insertions, 1140 deletions
diff --git a/keyboards/acheron/arctic/chconf.h b/keyboards/acheron/arctic/chconf.h
index 1be94008b..438ec8ec3 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 08567482d..35fb88318 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 c34640ac0..6801ae9a5 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 a972edf03..94e724a1f 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 472690105..5af0aad34 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 2e0092e3e..822691e22 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 d96371e05..f2cad9895 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 672c3e44c..49649adb3 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 ca99ad8cc..769b29f22 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 b0d978988..93c4ebe40 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 81ebe98fc..0f07a8ba9 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 e4692d9df..1b3da00c0 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 de89ae272..644ca1c1c 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 0df06ecc1..9f541944f 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 cc63adc45..677ee1388 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 8c40cd808..ac649b27d 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 c82db1041..91f1ae9c0 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 69a54bbbb..7c6af767f 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 62dc90732..645412d47 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 61e5dcb6a..40aa1fd9b 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 a6d89716c..583eb9feb 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 c9bc54b43..ae16c0f74 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 512dd7e5f..2bf13952d 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 4263e4a41..ddf9c24df 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 ecf0d0461..0f412cfbf 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 63148d5ce..6df38c652 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 de42fc7db..f94932c6e 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 fffb7a905..ca4a976c2 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 8329725a7..f3eb1c05e 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 4830d0b27..6cc4e27c1 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 e6cdb8763..7239dcafc 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 2782412be..daed31812 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 60aebdea1..4f9d43325 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 2253cfab1..eed5776e7 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 c5242220b..7005cf234 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 f23a91114..2d1b7a3bf 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 58a9736f1..1716aa6cc 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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_ST_RESOLUTION                16
-#define CH_CFG_INTERVALS_SIZE               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 463f9accb..6fbac77af 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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 d3860afbe..710d8aa43 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 e9f16c880..bc3672f6f 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 521da596f..c8e4b98ad 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 aec464019..13cb5645d 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 b53557576..847f2cc28 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 13281bd76..524edbe8f 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 69b87423a..de4ab83ec 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 ae08512d4..878879db1 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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 aa3372fc3..4ecd0f52a 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 ae08512d4..d54f2a26a 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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 46d8af4a8..c7a982aed 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 cfec50b6e..33ceb1431 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 c80efff69..199e8d05b 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 5be02963c..cfcced3cf 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 1664f045c..c10f1f287 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 f1230634b..1e126a865 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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 01a052754..fb7536ceb 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 f1230634b..435bf3274 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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 883ab46d1..c92d2a276 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 275f2b876..3b48fc5cd 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 7c20b34e7..36199f649 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 d65408a1b..6084293ff 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
+ * 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
+ * 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.
+ * (at your option) any later version.
 *
- *  This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 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 256dd73f9..f2330f083 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 3dae797c7..962653ec4 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 d955082ae..6b35146c7 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 54f9e834f..975667df0 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 5e08a4a7a..3ac134506 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 1218c8905..1a57dca36 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 4f28655fc..5bceae30a 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 98c1cdf54..7b1933eb1 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 262aa5807..350362ccb 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 e1f154b1e..b2c8dec67 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 ccf619fdc..94fe5f197 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 b19c80a7b..58f2142ae 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 1d83a6712..d1fc8e153 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 e34e007fe..51c2e7571 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 2e6e17f1a..4ee403413 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 257bb696a..44b49fc39 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 6d2fa9734..000000000
--- 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 8e3818ea2..000000000
--- 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 0298c11c4..e1243f23e 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 44182595b..c5beb2df1 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 72266cbbb..2dfe6f0be 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 2b6da6c97..2de08dea3 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 f9146fe52..144f324bc 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 523ffe460..18befdb8e 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 5c06b72c8..0a89eb248 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 2245de22d..b42ecdbb0 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 6b6a8526c..4fbe44bd1 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 8ea62c976..21cc2cee6 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 eabb44a1f..4cab3f93f 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 1c2fed228..c341c6fba 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 be287db09..000000000
--- 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 76d16808a..0f68479a0 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 6a1f54a27..d2cc7a7c4 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 1860897bb..d220eec49 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 d4d8b46ae..41c38c33e 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 886a89679..71b34b059 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 1d1191ca1..6dec71d66 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 d30ea0bfe..5b1d65cb7 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 28defbc87..54f9eb7c2 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 3f64f006f..9d163f5f0 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 7b09e5cb8..e98ee9d79 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 9d2548858..3e348b2b0 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:
author	Nick Brassel <nick@tzarc.org>	2021-01-21 17:00:53 +1100
committer	GitHub <noreply@github.com>	2021-01-21 17:00:53 +1100
commit	bdb757e189bf72c0ef382a924328642a629e06d5 (patch)
tree	6497c5fdad5096fa3c66bc05d42a8a222bc66c2b
parent	ea51cbf1d963ac3e4f327bc28ebe69b4bb39bade (diff)
download	qmk_firmware-bdb757e189bf72c0ef382a924328642a629e06d5.tar.gz qmk_firmware-bdb757e189bf72c0ef382a924328642a629e06d5.zip