diff options
| author | tmk <nobody@nowhere> | 2013-04-20 00:46:48 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-04-20 00:46:48 +0900 |
| commit | 2fc681b4f768484c2ba5cfa22662bf4c09586e57 (patch) | |
| tree | ead46c28553b5225699d36e416b10ef2c129ae70 /keyboard | |
| parent | 246031b6471a364f082c0eb4a0fb858821ae767b (diff) | |
| parent | 663027751831eb0e80d64c90aaf82d2921533aed (diff) | |
Merge branch 'iwrap5'
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/hhkb/Makefile.iwrap | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap index 8d7f4fc66e..2d9d82c481 100644 --- a/keyboard/hhkb/Makefile.iwrap +++ b/keyboard/hhkb/Makefile.iwrap @@ -29,8 +29,6 @@ OPT_DEFS = -DDEBUG_LEVEL=0 # MCU name, you MUST set this to match the board you are using # type "make clean" after changing this, so all files will be rebuilt MCU = atmega328p -# avrdude doesn't know atmega168p -AVRDUDE_MCU = $(MCU) # Processor frequency. @@ -41,6 +39,15 @@ AVRDUDE_MCU = $(MCU) F_CPU = 12000000 +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=2048 + + # Build Options # comment out to disable the options. # @@ -75,8 +82,8 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex # to submit bug reports. #AVRDUDE_VERBOSE = -v -v -#AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -c $(AVRDUDE_PROGRAMMER) +#AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) +AVRDUDE_FLAGS = -p $(MCU) -c $(AVRDUDE_PROGRAMMER) AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) @@ -89,9 +96,8 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) -#include $(TOP_DIR)/protocol/iwrap.mk -# To be swatchable btween Bluetooth and USB. Comment out if you don't need USB. -include $(TOP_DIR)/protocol/vusb.mk -#include $(TOP_DIR)/protocol.mk +include $(TOP_DIR)/protocol/iwrap.mk +# TODO: to be selectable: V-USB, LUFA or PJRC +#include $(TOP_DIR)/protocol/vusb.mk include $(TOP_DIR)/common.mk include $(TOP_DIR)/rules.mk |