Migrations after rebase

waffle87 · waffle87 · commit 1dbed47c5647 · 2026-05-07T10:23:34.000-06:00
diff --git a/keyboards/cornifi/config.h b/keyboards/cornifi/config.h
@@ -8,7 +8,4 @@
 #define SERIAL_USART_RX_PIN GP13
 #define USB_VBUS_PIN GP24
 
-/* RP2040- and hardware-specific config */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/keyboards/cornifi/keyboard.json b/keyboards/cornifi/keyboard.json
@@ -44,6 +44,10 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "rp2040_bootloader": {
+        "double_tap_reset": true,
+        "double_tap_reset_timeout": 500
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x5_3_ex2"
     },
diff --git a/keyboards/era/sirind/tomak79h/config.h b/keyboards/era/sirind/tomak79h/config.h
@@ -9,10 +9,3 @@
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
 #define SERIAL_USART_PIN_SWAP
-<<<<<<< HEAD
-
-/* Reset */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-=======
->>>>>>> 33252b93ee (Migrate keyboards E)
diff --git a/keyboards/era/sirind/tomak79s/config.h b/keyboards/era/sirind/tomak79s/config.h
@@ -9,10 +9,3 @@
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
 #define SERIAL_USART_PIN_SWAP
-<<<<<<< HEAD
-
-/* Reset */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-=======
->>>>>>> 33252b93ee (Migrate keyboards E)
diff --git a/keyboards/mechanicalkeyboards/point65/config.h b/keyboards/mechanicalkeyboards/point65/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* Double tap the side button to enter bootloader */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-
 /* couple of defaults */
 #define RGB_INDICATOR_POS_OFFSET    48      /* Indicator LEDs additional brightness */
diff --git a/keyboards/mechanicalkeyboards/point65/info.json b/keyboards/mechanicalkeyboards/point65/info.json
@@ -66,6 +66,10 @@
         "device_version": "1.0.0",
         "vid": "0x4242"
     },
+    "rp2040_bootloader": {
+        "double_tap_reset": true,
+        "double_tap_reset_timeout": 500
+    },
     "ws2812": {
         "driver": "vendor"
     },
diff --git a/keyboards/zeix/singa/rubrehaku/config.h b/keyboards/zeix/singa/rubrehaku/config.h
diff --git a/keyboards/zeix/singa/rubrehaku/keyboard.json b/keyboards/zeix/singa/rubrehaku/keyboard.json
@@ -46,6 +46,10 @@
         "pid": "0x8889",
         "vid": "0x4C27"
     },
+    "rp2040_bootloader": {
+        "double_tap_reset": true,
+        "double_tap_reset_timeout": 500
+    },
     "ws2812": {
         "driver": "vendor",
         "pin": "GP20"
