summary refs log tree commit diff
path: root/keyboards/matrix
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-01-20 00:23:07 +1100
committerGitHub <noreply@github.com>2021-01-20 00:23:07 +1100
commitd85b27bbbc6b086db469570cf741b515695dd816 (patch)
tree07686f572255adfb278aa10a4d3021619fab264c /keyboards/matrix
parentd668fd3977c46bd5c9a5c50ce77ac86c85cc18ed (diff)
Leftover early initialisation conversions (#11615)
* jm60

* ergodox_stm32

* F042 bootloader jumps.

* xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072.

* matrix/m20add, matrix/noah
Diffstat (limited to 'keyboards/matrix')
-rw-r--r--keyboards/matrix/m20add/boards/m20add_bd/board.c2
-rw-r--r--keyboards/matrix/m20add/config.h4
-rw-r--r--keyboards/matrix/noah/boards/noah_bd/board.c2
-rw-r--r--keyboards/matrix/noah/config.h2
4 files changed, 4 insertions, 6 deletions
diff --git a/keyboards/matrix/m20add/boards/m20add_bd/board.c b/keyboards/matrix/m20add/boards/m20add_bd/board.c
index 95d9045a0c..fa5723ec2b 100644
--- a/keyboards/matrix/m20add/boards/m20add_bd/board.c
+++ b/keyboards/matrix/m20add/boards/m20add_bd/board.c
@@ -208,8 +208,6 @@ static void stm32_gpio_init(void) {
  *          else.
  */
 void __early_init(void) {
-  extern void enter_bootloader_mode_if_requested(void);
-  enter_bootloader_mode_if_requested();
 
   stm32_gpio_init();
   stm32_clock_init();
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 3164346495..f404ef9ccd 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID  0x4D58   // MX
 #define PRODUCT_ID 0x20AD   // 8XV2.0 Additional
@@ -94,5 +96,3 @@
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_COUNT 1
 #define DRIVER_LED_TOTAL RGBLED_NUM
-
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE    // disable jump to system bootloader
diff --git a/keyboards/matrix/noah/boards/noah_bd/board.c b/keyboards/matrix/noah/boards/noah_bd/board.c
index 95d9045a0c..fa5723ec2b 100644
--- a/keyboards/matrix/noah/boards/noah_bd/board.c
+++ b/keyboards/matrix/noah/boards/noah_bd/board.c
@@ -208,8 +208,6 @@ static void stm32_gpio_init(void) {
  *          else.
  */
 void __early_init(void) {
-  extern void enter_bootloader_mode_if_requested(void);
-  enter_bootloader_mode_if_requested();
 
   stm32_gpio_init();
   stm32_clock_init();
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 796e45e2fa..eac752911f 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID  0x4D58   // MX
 #define PRODUCT_ID 0x0065   // noah 65