summaryrefslogtreecommitdiff
path: root/tool/mbed
diff options
context:
space:
mode:
authorJun Wako <wakojun@gmail.com>2015-01-04 17:03:47 +0900
committerJun Wako <wakojun@gmail.com>2015-01-04 17:21:43 +0900
commitd0fefb76f8a1430c749e67bc72b4dba00c7143c9 (patch)
tree2cf2fe560e83fef19c9a99adcc5d2b2300145bfc /tool/mbed
parentc6e533ce83d6ae4393e6cdf1f6d39ffefc790115 (diff)
downloadqmk_firmware-d0fefb76f8a1430c749e67bc72b4dba00c7143c9.tar.gz
qmk_firmware-d0fefb76f8a1430c749e67bc72b4dba00c7143c9.zip
infinity: Add initial files for keyboard support
Diffstat (limited to 'tool/mbed')
-rw-r--r--tool/mbed/lpc11u35_501.mk1
-rw-r--r--tool/mbed/mbed.mk10
2 files changed, 7 insertions, 4 deletions
diff --git a/tool/mbed/lpc11u35_501.mk b/tool/mbed/lpc11u35_501.mk
index 15e14910ce..328d03d66a 100644
--- a/tool/mbed/lpc11u35_501.mk
+++ b/tool/mbed/lpc11u35_501.mk
@@ -17,6 +17,7 @@ CC_SYMBOLS = \
-D__MBED__=1
OBJECTS += \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC11U.o \
$(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/startup_LPC11xx.o \
$(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.o \
$(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/system_LPC11Uxx.o \
diff --git a/tool/mbed/mbed.mk b/tool/mbed/mbed.mk
index db322b260a..2657a0fd37 100644
--- a/tool/mbed/mbed.mk
+++ b/tool/mbed/mbed.mk
@@ -4,7 +4,9 @@
OBJECTS += \
$(OBJDIR)/libraries/mbed/common/gpio.o \
$(OBJDIR)/libraries/mbed/common/us_ticker_api.o \
- $(OBJDIR)/libraries/mbed/common/wait_api.o
+ $(OBJDIR)/libraries/mbed/common/wait_api.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBDevice.o
+
# $(OBJDIR)/libraries/mbed/common/assert.o \
# $(OBJDIR)/libraries/mbed/common/board.o \
@@ -75,9 +77,9 @@ INCLUDE_PATHS += \
-I$(MBED_DIR)/libraries/USBDevice/USBSerial
# TMK mbed protocol
-#OBJECTS += \
-# $(OBJDIR)/protocol/mbed/mbed_driver.o \
-# $(OBJDIR)/protocol/mbed/HIDKeyboard.o
+OBJECTS += \
+ $(OBJDIR)/protocol/mbed/mbed_driver.o \
+ $(OBJDIR)/protocol/mbed/HIDKeyboard.o
INCLUDE_PATHS += \
-I$(TMK_DIR)/protocol/mbed