Fix WAIT_FOR_USB handling

keyboards/converter/hp_46010a/keyboard.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0xFEED",
     "pid": "0x6060",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "wait_for": true
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",

keyboards/converter/hp_46010a/rules.mk

@@ -1,4 +1,3 @@
-WAIT_FOR_USB = yes
 CUSTOM_MATRIX = yes
 
 SRC = matrix.c

keyboards/geekboards/macropad_v2/config.h

@@ -21,5 +21,3 @@
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_PWM_DMA_CHANNEL 3
-
-#define WAIT_FOR_USB

keyboards/geekboards/macropad_v2/keyboard.json

@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x0483",
     "pid": "0xA372",
-    "device_version": "0.0.2"
+    "device_version": "0.0.2",
+    "wait_for": true
   },
   "qmk": {
     "tap_keycode_delay": 10

keyboards/ristretto/keyboard.json

@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x666B",
         "pid": "0x7273",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "wait_for": true
     },
     "features": {
         "bootmagic": false,

keyboards/ristretto/rules.mk

@@ -1 +0,0 @@
-WAIT_FOR_USB = yes

tmk_core/protocol.mk

@@ -66,6 +66,10 @@ ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
     OPT_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
+ifeq ($(strip $(WAIT_FOR_USB)), yes)
+    OPT_DEFS += -DWAIT_FOR_USB
+endif
+
 ifeq ($(strip $(JOYSTICK_SHARED_EP)), yes)
     OPT_DEFS += -DJOYSTICK_SHARED_EP
     SHARED_EP_ENABLE = yes