Fix PDITarget_ReceiveByte() not discarding the start bit properly, and reading in...

[pub/USBasp.git] / Bootloaders / TeensyHID / makefile

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 92dd8b9..6f45cf5 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -63,31 +63,42 @@
 MCU = at90usb162\r
 \r
 \r
 MCU = at90usb162\r
 \r
 \r

-# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r

 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r

-BOARD  = USBKEY\r
+BOARD  = \r

 \r
 \r
 # Processor frequency.\r
 #     This will define a symbol, F_CPU, in all source code files equal to the \r
 \r
 \r
 # Processor frequency.\r
 #     This will define a symbol, F_CPU, in all source code files equal to the \r

-#     processor frequency. You can then use this symbol in your source code to \r
+#     processor frequency in Hz. You can then use this symbol in your source code to \r

 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done\r
 #     automatically to create a 32-bit value in your source code.\r
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done\r
 #     automatically to create a 32-bit value in your source code.\r

-#     Typical values are:\r
-#         F_CPU =  1000000\r
-#         F_CPU =  1843200\r
-#         F_CPU =  2000000\r
-#         F_CPU =  3686400\r
-#         F_CPU =  4000000\r
-#         F_CPU =  7372800\r
-#         F_CPU =  8000000\r
-#         F_CPU = 11059200\r
-#         F_CPU = 14745600\r
-#         F_CPU = 16000000\r
-#         F_CPU = 18432000\r
-#         F_CPU = 20000000\r
-F_CPU = 8000000\r
+#\r
+#     This will be an integer division of F_CLOCK below, as it is sourced by\r
+#     F_CLOCK after it has run through any CPU prescalers. Note that this value\r
+#     does not *change* the processor frequency - it should merely be updated to\r
+#     reflect the processor speed set externally so that the code can use accurate\r
+#     software delays.\r
+F_CPU = 16000000\r
+\r
+\r
+# Input clock frequency.\r
+#     This will define a symbol, F_CLOCK, in all source code files equal to the \r
+#     input clock frequency (before any prescaling is performed) in Hz. This value may\r
+#     differ from F_CPU if prescaling is used on the latter, and is required as the\r
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed\r
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'\r
+#     at the end, this will be done automatically to create a 32-bit value in your\r
+#     source code.\r
+#\r
+#     If no clock division is performed on the input clock inside the AVR (via the\r
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r
+F_CLOCK = $(F_CPU)\r
+\r
+\r
+# Starting byte address of the bootloader\r
+BOOT_START = 0xC000\r

 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r


@@ -104,17 +115,36 @@ TARGET = TeensyHID
 OBJDIR = .\r
 \r
 \r
 OBJDIR = .\r
 \r
 \r

+# Path to the LUFA library\r
+LUFA_PATH = ../..\r
+\r
+\r
+# LUFA library compile-time options\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
+\r
+\r

 # List C source files here. (C dependencies are automatically generated.)\r
 # List C source files here. (C dependencies are automatically generated.)\r

-SRC = $(TARGET).c                                          \\r
-         Descriptors.c                                        \\r
-         ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
-         ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
-         ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
-         ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
-         ../../LUFA/Drivers/USB/HighLevel/Events.c            \\r
-         ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \\r
-         \r
+SRC = $(TARGET).c                                                 \\r
+         Descriptors.c                                               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
+\r
+\r

 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r


@@ -146,7 +176,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r

-EXTRAINCDIRS = ../../\r
+EXTRAINCDIRS = $(LUFA_PATH)/\r

 \r
 \r
 # Compiler flag to set the C Standard level.\r
 \r
 \r
 # Compiler flag to set the C Standard level.\r


@@ -157,15 +187,10 @@ EXTRAINCDIRS = ../../
 CSTANDARD = -std=gnu99\r
 \r
 \r
 CSTANDARD = -std=gnu99\r
 \r
 \r

-# Starting byte address of the bootloader\r
-BOOT_START = 0xC000\r
-\r
-\r

 # Place -D or -U options here for C sources\r
 # Place -D or -U options here for C sources\r

-CDEFS  = -DF_CPU=$(F_CPU)UL -DBOARD=BOARD_$(BOARD) -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DSTATIC_ENDPOINT_CONFIGURATION\r
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION\r
-CDEFS += -DNO_CLEARSET_FEATURE_REQUEST\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
+\r

 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r


@@ -194,10 +219,6 @@ CFLAGS += -ffunction-sections
 CFLAGS += -fpack-struct\r
 CFLAGS += -fshort-enums\r
 CFLAGS += -fno-inline-small-functions\r
 CFLAGS += -fpack-struct\r
 CFLAGS += -fshort-enums\r
 CFLAGS += -fno-inline-small-functions\r

-CFLAGS += -fno-reorder-blocks\r
-CFLAGS += -fno-reorder-blocks-and-partition\r
-CFLAGS += -fno-reorder-functions\r
-CFLAGS += -fno-toplevel-reorder\r

 CFLAGS += -Wall\r
 CFLAGS += -Wstrict-prototypes\r
 CFLAGS += -Wundef\r
 CFLAGS += -Wall\r
 CFLAGS += -Wstrict-prototypes\r
 CFLAGS += -Wundef\r


@@ -303,9 +324,9 @@ EXTMEMOPTS =
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
 LDFLAGS = -Wl,-Map=$(TARGET).map,--cref\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
 LDFLAGS = -Wl,-Map=$(TARGET).map,--cref\r

+LDFLAGS += -Wl,--section-start=.text=$(BOOT_START)\r

 LDFLAGS += -Wl,--relax \r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += -Wl,--relax \r
 LDFLAGS += -Wl,--gc-sections\r

-LDFLAGS += -Wl,--section-start=.text=$(BOOT_START)\r

 LDFLAGS += $(EXTMEMOPTS)\r
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))\r
 LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)\r
 LDFLAGS += $(EXTMEMOPTS)\r
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))\r
 LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)\r


@@ -442,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 \r
 \r
 # Default target.\r
 \r
 \r
 # Default target.\r

-all: begin gccversion sizebefore build checkhooks checklibmode sizeafter end\r
+all: begin gccversion sizebefore build checkinvalidevents showliboptions showtarget sizeafter end\r

 \r
 # Change the build target to build a HEX file or a library.\r
 build: elf hex eep lss sym\r
 \r
 # Change the build target to build a HEX file or a library.\r
 build: elf hex eep lss sym\r


@@ -485,28 +506,39 @@ sizeafter:
        @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \\r
        2>/dev/null; echo; fi\r
 \r
        @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \\r
        2>/dev/null; echo; fi\r
 \r

-checkhooks: build\r
+$(LUFA_PATH)/LUFA/LUFA_Events.lst:\r
+       @make -C $(LUFA_PATH)/LUFA/ LUFA_Events.lst\r
+\r
+checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst\r
+       @echo\r
+       @echo Checking for invalid events...\r
+       @$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \\r
+                        grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true\r
+       @sed -n -e 's/^/  WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp\r
+       @if test -s InvalidEvents.tmp; then exit 1; fi\r
+       \r
+showliboptions:\r

        @echo\r
        @echo\r

-       @echo ------- Unhooked LUFA Events -------\r
-       @$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \\r
-                  cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
-                          echo "(None)"\r
-       @echo ----- End Unhooked LUFA Events -----\r
+       @echo ---- Compile Time Library Options ----\r
+       @for i in $(LUFA_OPTS:-D%=%); do \\r
+               echo $$i; \\r
+       done\r
+       @echo --------------------------------------\r

 \r
 \r

-checklibmode:\r
+showtarget:\r

        @echo\r
        @echo\r

-       @echo ----------- Library Mode -----------\r
-       @$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \\r
-                 | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \\r
-                 || echo "No specific mode (both device and host mode allowable)."\r
-       @echo ------------------------------------\r
+       @echo --------- Target Information ---------\r
+       @echo AVR Model: $(MCU)\r
+       @echo Board:     $(BOARD)\r
+       @echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master\r
+       @echo --------------------------------------\r
+       \r

 \r
 # Display compiler version information.\r
 gccversion : \r
        @$(CC) --version\r
 \r
 \r
 \r
 # Display compiler version information.\r
 gccversion : \r
        @$(CC) --version\r
 \r
 \r

-\r

 # Program the device.  \r
 program: $(TARGET).hex $(TARGET).eep\r
        $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)\r
 # Program the device.  \r
 program: $(TARGET).hex $(TARGET).eep\r
        $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)\r


@@ -522,16 +554,17 @@ dfu: $(TARGET).hex
        dfu-programmer $(MCU) reset\r
 \r
 flip-ee: $(TARGET).hex $(TARGET).eep\r
        dfu-programmer $(MCU) reset\r
 \r
 flip-ee: $(TARGET).hex $(TARGET).eep\r

-       copy $(TARGET).eep $(TARGET)eep.hex\r
+       $(COPY) $(TARGET).eep $(TARGET)eep.hex\r

        batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase\r
        batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program\r
        batchisp -hardware usb -device $(MCU) -operation start reset 0\r
        batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase\r
        batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program\r
        batchisp -hardware usb -device $(MCU) -operation start reset 0\r

+       $(REMOVE) $(TARGET)eep.hex\r

 \r
 dfu-ee: $(TARGET).hex $(TARGET).eep\r
 \r
 dfu-ee: $(TARGET).hex $(TARGET).eep\r

-       dfu-programmer $(MCU) erase\r
-       dfu-programmer $(MCU) eeprom --debug 1 $(TARGET).eep\r
+       dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep\r

        dfu-programmer $(MCU) reset\r
 \r
        dfu-programmer $(MCU) reset\r
 \r

+\r

 # Generate avr-gdb config/init file which does the following:\r
 #     define the reset signal, load the target file, connect to target, and set \r
 #     a breakpoint at main().\r
 # Generate avr-gdb config/init file which does the following:\r
 #     define the reset signal, load the target file, connect to target, and set \r
 #     a breakpoint at main().\r


@@ -670,10 +703,11 @@ clean: begin clean_list clean_binary end
 \r
 clean_binary:\r
        $(REMOVE) $(TARGET).hex\r
 \r
 clean_binary:\r
        $(REMOVE) $(TARGET).hex\r

-\r
+       \r

 clean_list:\r
        @echo $(MSG_CLEANING)\r
        $(REMOVE) $(TARGET).eep\r
 clean_list:\r
        @echo $(MSG_CLEANING)\r
        $(REMOVE) $(TARGET).eep\r

+       $(REMOVE) $(TARGET)eep.hex\r

        $(REMOVE) $(TARGET).cof\r
        $(REMOVE) $(TARGET).elf\r
        $(REMOVE) $(TARGET).map\r
        $(REMOVE) $(TARGET).cof\r
        $(REMOVE) $(TARGET).elf\r
        $(REMOVE) $(TARGET).map\r


@@ -684,9 +718,9 @@ clean_list:
        $(REMOVE) $(SRC:.c=.s)\r
        $(REMOVE) $(SRC:.c=.d)\r
        $(REMOVE) $(SRC:.c=.i)\r
        $(REMOVE) $(SRC:.c=.s)\r
        $(REMOVE) $(SRC:.c=.d)\r
        $(REMOVE) $(SRC:.c=.i)\r

+       $(REMOVE) InvalidEvents.tmp\r

        $(REMOVEDIR) .dep\r
 \r
        $(REMOVEDIR) .dep\r
 \r

-\r

 doxygen:\r
        @echo Generating Project Documentation...\r
        @doxygen Doxygen.conf\r
 doxygen:\r
        @echo Generating Project Documentation...\r
        @doxygen Doxygen.conf\r


@@ -704,8 +738,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 \r
 \r
 # Listing of phony targets.\r
 \r
 \r
 # Listing of phony targets.\r

-.PHONY : all checkhooks checklibmode begin  \\r
-finish end sizebefore sizeafter gccversion  \\r
-build elf hex eep lss sym coff extcoff      \\r
-clean clean_list clean_binary program debug \\r
-gdb-config doxygen\r
+.PHONY : all checkinvalidevents showliboptions    \\r
+showtarget begin finish end sizebefore sizeafter  \\r
+gccversion build elf hex eep lss sym coff extcoff \\r
+program dfu flip flip-ee dfu-ee clean debug       \\r
+clean_list clean_binary gdb-config doxygen
\ No newline at end of file