X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=build_keyboard.mk;h=4781f4a5d1946cf9d77033dcd9904d1f7fb20c16;hb=ccc87421e77f554cac08d2f8b2c3cbcb04f6181c;hp=5a82abd31541490881b611d2629541c214fdd5a2;hpb=162a67cbc567c11c507bfc153d155f5db2dd19bf;p=qmk_firmware.git

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 5a82abd31..4781f4a5d 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -143,6 +143,8 @@ ifeq ($(PLATFORM),CHIBIOS)
         OPT_DEFS += -include $(KEYBOARD_PATH_1)/bootloader_defs.h
      else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h)","")
         OPT_DEFS += -include $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h
+    else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h)","")
+        OPT_DEFS += -include $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h
     endif
 endif
 
@@ -202,7 +204,11 @@ else
 endif
 
 # User space stuff
-USER_PATH := users/$(KEYMAP)
+ifeq ("$(USER_NAME)","")
+    USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
 -include $(USER_PATH)/rules.mk
 ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
     CONFIG_H += users/$(KEYMAP)/config.h