summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb Elwert <belak@coded.io>2018-04-04 04:43:40 +0200
committerJack Humbert <jack.humb@gmail.com>2018-04-04 05:06:14 +0200
commitf6b3c67678d346b57c965142ca4a2b6ba588bbb7 (patch)
tree790d468e542af478c22365c283456046269adf45
parent67053712f885641d3a8332239416ff8163a68647 (diff)
downloadqmk_firmware-f6b3c67678d346b57c965142ca4a2b6ba588bbb7.tar.gz
qmk_firmware-f6b3c67678d346b57c965142ca4a2b6ba588bbb7.tar.xz
Update whitefox to use the K-Type teensy workaround
-rw-r--r--build_keyboard.mk2
-rw-r--r--drivers/boards/IC_TEENSY_3_1/board.c (renamed from keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.c)0
-rw-r--r--drivers/boards/IC_TEENSY_3_1/board.h (renamed from keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.h)0
-rw-r--r--drivers/boards/IC_TEENSY_3_1/board.mk5
-rw-r--r--keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.mk5
-rw-r--r--keyboards/k_type/rules.mk2
-rw-r--r--keyboards/whitefox/rules.mk10
-rw-r--r--tmk_core/chibios.mk3
8 files changed, 17 insertions, 10 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 5a82abd31..90a3df776 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
diff --git a/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.c b/drivers/boards/IC_TEENSY_3_1/board.c
index 1e952883d..1e952883d 100644
--- a/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.c
+++ b/drivers/boards/IC_TEENSY_3_1/board.c
diff --git a/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.h b/drivers/boards/IC_TEENSY_3_1/board.h
index 8853395ef..8853395ef 100644
--- a/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.h
+++ b/drivers/boards/IC_TEENSY_3_1/board.h
diff --git a/drivers/boards/IC_TEENSY_3_1/board.mk b/drivers/boards/IC_TEENSY_3_1/board.mk
new file mode 100644
index 000000000..62f5b751c
--- /dev/null
+++ b/drivers/boards/IC_TEENSY_3_1/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = $(BOARD_PATH)/boards/IC_TEENSY_3_1/board.c
+
+# Required include directories
+BOARDINC = $(BOARD_PATH)/boards/IC_TEENSY_3_1
diff --git a/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.mk b/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.mk
deleted file mode 100644
index c946e27fc..000000000
--- a/keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List of all the board related files.
-BOARDSRC = $(BOARD_PATH)/boards/K_TYPE_TEENSY_3_1/board.c
-
-# Required include directories
-BOARDINC = $(BOARD_PATH)/boards/K_TYPE_TEENSY_3_1
diff --git a/keyboards/k_type/rules.mk b/keyboards/k_type/rules.mk
index ca6c844fb..a1c56903b 100644
--- a/keyboards/k_type/rules.mk
+++ b/keyboards/k_type/rules.mk
@@ -40,7 +40,7 @@ MCU_STARTUP = k20x7
# This board was copied from PJRC_TEENSY_3_1. The only difference should be a
# hack to ensure the watchdog has started before trying to disable it.
-BOARD = K_TYPE_TEENSY_3_1
+BOARD = IC_TEENSY_3_1
# Cortex version
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
diff --git a/keyboards/whitefox/rules.mk b/keyboards/whitefox/rules.mk
index 32273e08a..9f222bf4f 100644
--- a/keyboards/whitefox/rules.mk
+++ b/keyboards/whitefox/rules.mk
@@ -38,7 +38,7 @@ MCU_STARTUP = k20x7
# - PJRC_TEENSY_3 for Teensy 3.0
# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2
# - MCHCK_K20 for Infinity KB
-BOARD = PJRC_TEENSY_3_1
+BOARD = IC_TEENSY_3_1
# Cortex version
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
@@ -52,7 +52,9 @@ ARMV = 7
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
-OPT_DEFS =
+OPT_DEFS =
+
+DFU_ARGS = -d 1c11:b007
# Build Options
# comment out to disable the options.
@@ -70,5 +72,5 @@ BACKLIGHT_ENABLE = yes
VISUALIZER_ENABLE = yes
LED_DRIVER = is31fl3731c
-LED_WIDTH = 16
-LED_HEIGHT = 5 \ No newline at end of file
+LED_WIDTH = 16
+LED_HEIGHT = 5
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 7c7f658b2..e53204905 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -63,6 +63,9 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
BOARD_PATH = $(KEYBOARD_PATH_1)
BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk
+else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/board.mk)","")
+ BOARD_PATH = $(TOP_DIR)/drivers
+ BOARD_MK += $(TOP_DIR)/drivers/boards/$(BOARD)/board.mk
endif
ifeq ("$(wildcard $(BOARD_MK))","")