Add keyboard/infinity

2015-01-02 21:16:40 +09:00 · 2015-01-02 21:16:40 +09:00 · d239315cf1
commit d239315cf1
parent 3731921063
3 changed files with 105 additions and 56 deletions
--- a/tool/mbed/lpc11u35_501.mk
+++ b/tool/mbed/lpc11u35_501.mk
@ -44,6 +44,6 @@ INCLUDE_PATHS += \
 	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP \
 	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX \
 	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/TARGET_MCU_LPC11U35_501 \
-	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/TARGET_MCU_LPC11U35_501/TARGET_LPC11U35_501 \
+	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/TARGET_MCU_LPC11U35_501/TARGET_LPC11U35_501

 LINKER_SCRIPT = $(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/TARGET_LPC11U35_501/LPC11U35.ld
--- a/tool/mbed/mbed.mk
+++ b/tool/mbed/mbed.mk
@ -2,60 +2,64 @@
 # see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded

 OBJECTS += \
-	$(OBJDIR)/libraries/mbed/common/BusIn.o \
-	$(OBJDIR)/libraries/mbed/common/BusInOut.o \
-	$(OBJDIR)/libraries/mbed/common/BusOut.o \
-	$(OBJDIR)/libraries/mbed/common/CAN.o \
-	$(OBJDIR)/libraries/mbed/common/CallChain.o \
-	$(OBJDIR)/libraries/mbed/common/Ethernet.o \
-	$(OBJDIR)/libraries/mbed/common/FileBase.o \
-	$(OBJDIR)/libraries/mbed/common/FileLike.o \
-	$(OBJDIR)/libraries/mbed/common/FilePath.o \
-	$(OBJDIR)/libraries/mbed/common/FileSystemLike.o \
-	$(OBJDIR)/libraries/mbed/common/FunctionPointer.o \
-	$(OBJDIR)/libraries/mbed/common/I2C.o \
-	$(OBJDIR)/libraries/mbed/common/I2CSlave.o \
-	$(OBJDIR)/libraries/mbed/common/InterruptIn.o \
-	$(OBJDIR)/libraries/mbed/common/InterruptManager.o \
-	$(OBJDIR)/libraries/mbed/common/LocalFileSystem.o \
-	$(OBJDIR)/libraries/mbed/common/RawSerial.o \
-	$(OBJDIR)/libraries/mbed/common/SPI.o \
-	$(OBJDIR)/libraries/mbed/common/SPISlave.o \
-	$(OBJDIR)/libraries/mbed/common/Serial.o \
-	$(OBJDIR)/libraries/mbed/common/SerialBase.o \
-	$(OBJDIR)/libraries/mbed/common/Stream.o \
-	$(OBJDIR)/libraries/mbed/common/Ticker.o \
-	$(OBJDIR)/libraries/mbed/common/Timeout.o \
-	$(OBJDIR)/libraries/mbed/common/Timer.o \
-	$(OBJDIR)/libraries/mbed/common/TimerEvent.o \
-	$(OBJDIR)/libraries/mbed/common/assert.o \
-	$(OBJDIR)/libraries/mbed/common/board.o \
-	$(OBJDIR)/libraries/mbed/common/error.o \
-	$(OBJDIR)/libraries/mbed/common/exit.o \
 	$(OBJDIR)/libraries/mbed/common/gpio.o \
-	$(OBJDIR)/libraries/mbed/common/mbed_interface.o \
-	$(OBJDIR)/libraries/mbed/common/pinmap_common.o \
-	$(OBJDIR)/libraries/mbed/common/retarget.o \
-	$(OBJDIR)/libraries/mbed/common/rtc_time.o \
-	$(OBJDIR)/libraries/mbed/common/semihost_api.o \
 	$(OBJDIR)/libraries/mbed/common/us_ticker_api.o \
-	$(OBJDIR)/libraries/mbed/common/wait_api.o \
-	$(OBJDIR)/libraries/USBDevice/USBAudio/USBAudio.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBDevice.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_KL25Z.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC11U.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC17.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC40.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.o \
-	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_STM32F4.o \
-	$(OBJDIR)/libraries/USBDevice/USBHID/USBHID.o \
-	$(OBJDIR)/libraries/USBDevice/USBHID/USBKeyboard.o \
-	$(OBJDIR)/libraries/USBDevice/USBHID/USBMouse.o \
-	$(OBJDIR)/libraries/USBDevice/USBHID/USBMouseKeyboard.o \
-	$(OBJDIR)/libraries/USBDevice/USBMIDI/USBMIDI.o \
-	$(OBJDIR)/libraries/USBDevice/USBMSD/USBMSD.o \
-	$(OBJDIR)/libraries/USBDevice/USBSerial/USBCDC.o \
-	$(OBJDIR)/libraries/USBDevice/USBSerial/USBSerial.o
+	$(OBJDIR)/libraries/mbed/common/wait_api.o
+
+#	$(OBJDIR)/libraries/mbed/common/assert.o \
+#	$(OBJDIR)/libraries/mbed/common/board.o \
+#	$(OBJDIR)/libraries/mbed/common/BusIn.o \
+#	$(OBJDIR)/libraries/mbed/common/BusInOut.o \
+#	$(OBJDIR)/libraries/mbed/common/BusOut.o \
+#	$(OBJDIR)/libraries/mbed/common/CallChain.o \
+#	$(OBJDIR)/libraries/mbed/common/CAN.o \
+#	$(OBJDIR)/libraries/mbed/common/error.o \
+#	$(OBJDIR)/libraries/mbed/common/Ethernet.o \
+#	$(OBJDIR)/libraries/mbed/common/exit.o \
+#	$(OBJDIR)/libraries/mbed/common/FileBase.o \
+#	$(OBJDIR)/libraries/mbed/common/FileLike.o \
+#	$(OBJDIR)/libraries/mbed/common/FilePath.o \
+#	$(OBJDIR)/libraries/mbed/common/FileSystemLike.o \
+#	$(OBJDIR)/libraries/mbed/common/FunctionPointer.o \
+#	$(OBJDIR)/libraries/mbed/common/gpio.o \
+#	$(OBJDIR)/libraries/mbed/common/I2C.o \
+#	$(OBJDIR)/libraries/mbed/common/I2CSlave.o \
+#	$(OBJDIR)/libraries/mbed/common/InterruptIn.o \
+#	$(OBJDIR)/libraries/mbed/common/InterruptManager.o \
+#	$(OBJDIR)/libraries/mbed/common/LocalFileSystem.o \
+#	$(OBJDIR)/libraries/mbed/common/mbed_interface.o \
+#	$(OBJDIR)/libraries/mbed/common/pinmap_common.o \
+#	$(OBJDIR)/libraries/mbed/common/RawSerial.o \
+#	$(OBJDIR)/libraries/mbed/common/retarget.o \
+#	$(OBJDIR)/libraries/mbed/common/rtc_time.o \
+#	$(OBJDIR)/libraries/mbed/common/semihost_api.o \
+#	$(OBJDIR)/libraries/mbed/common/SerialBase.o \
+#	$(OBJDIR)/libraries/mbed/common/Serial.o \
+#	$(OBJDIR)/libraries/mbed/common/SPI.o \
+#	$(OBJDIR)/libraries/mbed/common/SPISlave.o \
+#	$(OBJDIR)/libraries/mbed/common/Stream.o \
+#	$(OBJDIR)/libraries/mbed/common/Ticker.o \
+#	$(OBJDIR)/libraries/mbed/common/Timeout.o \
+#	$(OBJDIR)/libraries/mbed/common/TimerEvent.o \
+#	$(OBJDIR)/libraries/mbed/common/Timer.o \
+#	$(OBJDIR)/libraries/mbed/common/us_ticker_api.o \
+#	$(OBJDIR)/libraries/mbed/common/wait_api.o \
+#	$(OBJDIR)/libraries/USBDevice/USBAudio/USBAudio.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBDevice.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_KL25Z.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC11U.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC17.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC40.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.o \
+#	$(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_STM32F4.o \
+#	$(OBJDIR)/libraries/USBDevice/USBHID/USBHID.o \
+#	$(OBJDIR)/libraries/USBDevice/USBHID/USBKeyboard.o \
+#	$(OBJDIR)/libraries/USBDevice/USBHID/USBMouseKeyboard.o \
+#	$(OBJDIR)/libraries/USBDevice/USBHID/USBMouse.o \
+#	$(OBJDIR)/libraries/USBDevice/USBMIDI/USBMIDI.o \
+#	$(OBJDIR)/libraries/USBDevice/USBMSD/USBMSD.o \
+#	$(OBJDIR)/libraries/USBDevice/USBSerial/USBCDC.o \
+#	$(OBJDIR)/libraries/USBDevice/USBSerial/USBSerial.o

 INCLUDE_PATHS += \
 	-I$(MBED_DIR)/libraries/mbed \
@ -71,9 +75,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
--- a/tool/mbed/mk20d50m.mk
+++ b/tool/mbed/mk20d50m.mk
@ -0,0 +1,45 @@
+# based on Makefile exported form mbed.org
+# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded
+
+CPU = -mcpu=cortex-m4 -mthumb
+
+CC_SYMBOLS += \
+	-DTARGET_K20D50M \
+	-DTARGET_M4 \
+	-DTARGET_CORTEX_M \
+	-DTARGET_Freescale \
+	-DTOOLCHAIN_GCC_ARM \
+	-DTOOLCHAIN_GCC \
+	-D__CORTEX_M4 \
+	-DARM_MATH_CM4 \
+	-D__MBED__=1
+
+OBJECTS += \
+	$(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/startup_MK20D5.o \
+	$(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/cmsis_nvic.o \
+	$(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/system_MK20D5.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/analogin_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/gpio_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/gpio_irq_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/i2c_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/pinmap.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/port_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/pwmout_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/rtc_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/serial_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/sleep.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/spi_api.o \
+	$(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/us_ticker.o
+
+INCLUDE_PATHS += \
+	-I$(MBED_DIR)/libraries/mbed/targets \
+	-I$(MBED_DIR)/libraries/mbed/targets/cmsis \
+	-I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale \
+	-I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M \
+	-I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM \
+	-I$(MBED_DIR)/libraries/mbed/targets/hal \
+	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_Freescale \
+	-I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M
+
+LINKER_SCRIPT = $(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/MK20D5.ld
+#LINKER_SCRIPT = infinity.ld