Moved out the handling of V2 Protocol parameters to a seperate set of files. Added...

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

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index fce2e5b..3c79cb6 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -89,7 +89,11 @@ F_CPU = 8000000
 #\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
 #\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 = 8000000\r
+F_CLOCK = $(F_CPU)\r
+\r
+\r
+# Starting byte address of the bootloader\r
+BOOT_START = 0x1E000\r

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


@@ -113,10 +117,12 @@ LUFA_PATH = ../..
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r

+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r

 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\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
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -176,10 +182,6 @@ EXTRAINCDIRS = $(LUFA_PATH)/
 CSTANDARD = -std=gnu99\r
 \r
 \r
 CSTANDARD = -std=gnu99\r
 \r
 \r

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

 # Place -D or -U options here for C sources\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
 # Place -D or -U options here for C sources\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


@@ -456,7 +458,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 checkboard sizeafter end\r
+all: begin gccversion sizebefore build showeventhooks 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


@@ -499,27 +501,29 @@ 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
+showeventhooks: build\r

        @echo\r
        @echo\r

-       @echo ------- Unhooked LUFA Events -------\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
        @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \\r
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
                           echo "(None)"\r

-       @echo ------------------------------------\r
+       @echo --------------------------------------\r

 \r
 \r

-checklibmode:\r
+showliboptions:\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 ---- Compile Time Library Options ----\r
+       @for i in $(LUFA_OPTS:-D%=%); do \\r
+               echo $$i; \\r
+       done\r
+       @echo --------------------------------------\r

 \r
 \r

-checkboard:\r
+showtarget:\r

        @echo\r
        @echo\r

-       @echo ---------- Selected Board ----------\r
-       @echo Selected board model is $(BOARD).\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
 # Display compiler version information.\r
 gccversion : \r
        \r
 # Display compiler version information.\r
 gccversion : \r


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

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