darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update whitefox to use the K-Type teensy workaround

Browse source
This commit is contained in:
Kaleb Elwert 2018-04-03 19:43:40 -07:00 committed by Jack Humbert
parent 67053712f8
commit f6b3c67678
8 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_keyboard.mk
View file

@ -143,6 +143,8 @@ ifeq ($(PLATFORM),CHIBIOS)
OPT_DEFS += -include $(KEYBOARD_PATH_1)/bootloader_defs.h OPT_DEFS += -include $(KEYBOARD_PATH_1)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/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 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
endif endif

0
keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.c → drivers/boards/IC_TEENSY_3_1/board.c
View file

0
keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.h → drivers/boards/IC_TEENSY_3_1/board.h
View file

5
drivers/boards/IC_TEENSY_3_1/board.mk Normal file
View file

@ -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

5
keyboards/k_type/boards/K_TYPE_TEENSY_3_1/board.mk
View file

@ -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

2
keyboards/k_type/rules.mk
View file

@ -40,7 +40,7 @@ MCU_STARTUP = k20x7
# This board was copied from PJRC_TEENSY_3_1. The only difference should be a # 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. # 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 # Cortex version
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4

4
keyboards/whitefox/rules.mk
View file

@ -38,7 +38,7 @@ MCU_STARTUP = k20x7
# - PJRC_TEENSY_3 for Teensy 3.0 # - PJRC_TEENSY_3 for Teensy 3.0
# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 # - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2
# - MCHCK_K20 for Infinity KB # - MCHCK_K20 for Infinity KB
BOARD = PJRC_TEENSY_3_1 BOARD = IC_TEENSY_3_1
# Cortex version # Cortex version
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
@ -54,6 +54,8 @@ ARMV = 7
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 #OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
OPT_DEFS = OPT_DEFS =
DFU_ARGS = -d 1c11:b007
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

3
tmk_core/chibios.mk
View file

@ -63,6 +63,9 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","") else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
BOARD_PATH = $(KEYBOARD_PATH_1) BOARD_PATH = $(KEYBOARD_PATH_1)
BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk 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 endif
ifeq ("$(wildcard $(BOARD_MK))","") ifeq ("$(wildcard $(BOARD_MK))","")