Skip to content

Commit f6b3c67

Browse files
belakjackhumbert
authored andcommitted
Update whitefox to use the K-Type teensy workaround
1 parent 6705371 commit f6b3c67

File tree

8 files changed

+17
-10
lines changed

8 files changed

+17
-10
lines changed

build_keyboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ ifeq ($(PLATFORM),CHIBIOS)
143143
OPT_DEFS += -include $(KEYBOARD_PATH_1)/bootloader_defs.h
144144
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h)","")
145145
OPT_DEFS += -include $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h
146+
else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h)","")
147+
OPT_DEFS += -include $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h
146148
endif
147149
endif
148150

File renamed without changes.
File renamed without changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# List of all the board related files.
2+
BOARDSRC = $(BOARD_PATH)/boards/IC_TEENSY_3_1/board.c
3+
4+
# Required include directories
5+
BOARDINC = $(BOARD_PATH)/boards/IC_TEENSY_3_1

keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.mk

Lines changed: 0 additions & 5 deletions
This file was deleted.

keyboards/k_type/rules.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ MCU_STARTUP = k20x7
4040

4141
# This board was copied from PJRC_TEENSY_3_1. The only difference should be a
4242
# hack to ensure the watchdog has started before trying to disable it.
43-
BOARD = K_TYPE_TEENSY_3_1
43+
BOARD = IC_TEENSY_3_1
4444

4545
# Cortex version
4646
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4

keyboards/whitefox/rules.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ MCU_STARTUP = k20x7
3838
# - PJRC_TEENSY_3 for Teensy 3.0
3939
# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2
4040
# - MCHCK_K20 for Infinity KB
41-
BOARD = PJRC_TEENSY_3_1
41+
BOARD = IC_TEENSY_3_1
4242

4343
# Cortex version
4444
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
@@ -52,7 +52,9 @@ ARMV = 7
5252
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
5353
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
5454
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
55-
OPT_DEFS =
55+
OPT_DEFS =
56+
57+
DFU_ARGS = -d 1c11:b007
5658

5759
# Build Options
5860
# comment out to disable the options.
@@ -70,5 +72,5 @@ BACKLIGHT_ENABLE = yes
7072
VISUALIZER_ENABLE = yes
7173

7274
LED_DRIVER = is31fl3731c
73-
LED_WIDTH = 16
74-
LED_HEIGHT = 5
75+
LED_WIDTH = 16
76+
LED_HEIGHT = 5

tmk_core/chibios.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
6363
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
6464
BOARD_PATH = $(KEYBOARD_PATH_1)
6565
BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk
66+
else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/board.mk)","")
67+
BOARD_PATH = $(TOP_DIR)/drivers
68+
BOARD_MK += $(TOP_DIR)/drivers/boards/$(BOARD)/board.mk
6669
endif
6770

6871
ifeq ("$(wildcard $(BOARD_MK))","")

0 commit comments

Comments
 (0)