Fix incorrect Capabilities value in the CDC class Bootloader descriptors.

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

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 458a6ce..87cfd07 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -97,6 +97,7 @@ F_USB = $(F_CPU)
 FLASH_SIZE_KB        = 128
 BOOT_SECTION_SIZE_KB = 4
 BOOT_START           = 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc)
 FLASH_SIZE_KB        = 128
 BOOT_SECTION_SIZE_KB = 4
 BOOT_START           = 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc)

+BOOT_API_TABLESTART  = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - 32)" | bc)

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


@@ -137,6 +138,7 @@ include $(LUFA_PATH)/LUFA/makefile
 
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \
 
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \

+         BootloaderAPI.c                                             \

          Descriptors.c                                               \
          $(LUFA_SRC_USB)                                             \
 
          Descriptors.c                                               \
          $(LUFA_SRC_USB)                                             \
 


@@ -152,7 +154,7 @@ CPPSRC =
 #     Even though the DOS/Win* filesystem matches both .s and .S the same,
 #     it will preserve the spelling of the filenames, and gcc itself does
 #     care about how the name is spelled on its command-line.
 #     Even though the DOS/Win* filesystem matches both .s and .S the same,
 #     it will preserve the spelling of the filenames, and gcc itself does
 #     care about how the name is spelled on its command-line.

-ASRC =
+ASRC = BootloaderAPITable.S

 
 
 # Optimization level, can be [0, 1, 2, 3, s].
 
 
 # Optimization level, can be [0, 1, 2, 3, s].


@@ -333,7 +335,7 @@ EXTMEMOPTS =
 #    -Map:      create map file
 #    --cref:    add cross reference to  map file
 LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref
 #    -Map:      create map file
 #    --cref:    add cross reference to  map file
 LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref

-LDFLAGS += -Wl,--section-start=.text=$(BOOT_START)
+LDFLAGS += -Wl,--section-start=.text=$(BOOT_START) -Wl,--section-start=.apitable=$(BOOT_API_TABLESTART) -Wl,--undefined=BootloaderAPI_JumpTable

 LDFLAGS += -Wl,--relax
 LDFLAGS += -Wl,--gc-sections
 LDFLAGS += $(EXTMEMOPTS)
 LDFLAGS += -Wl,--relax
 LDFLAGS += -Wl,--gc-sections
 LDFLAGS += $(EXTMEMOPTS)


@@ -681,13 +683,22 @@ clean_list :
        $(REMOVEDIR) .dep
 
 doxygen:
        $(REMOVEDIR) .dep
 
 doxygen:

-       @echo Generating Project Documentation...
+       @echo Generating Project Documentation \($(TARGET)\)...

        @doxygen Doxygen.conf
        @echo Documentation Generation Complete.
 
 clean_doxygen:
        rm -rf Documentation
 
        @doxygen Doxygen.conf
        @echo Documentation Generation Complete.
 
 clean_doxygen:
        rm -rf Documentation
 

+checksource:
+       @for f in $(SRC) $(CPPSRC) $(ASRC); do \
+               if [ -f $$f ]; then \
+                       echo "Found Source File: $$f" ; \
+               else \
+                       echo "Source File Not Found: $$f" ; \
+               fi; done 
+
+

 # Create object files directory
 $(shell mkdir $(OBJDIR) 2>/dev/null)
 
 # Create object files directory
 $(shell mkdir $(OBJDIR) 2>/dev/null)
 


@@ -699,5 +710,5 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 # Listing of phony targets.
 .PHONY : all begin finish end sizebefore sizeafter gccversion \
 build elf hex eep lss sym coff extcoff doxygen clean          \
 # Listing of phony targets.
 .PHONY : all begin finish end sizebefore sizeafter gccversion \
 build elf hex eep lss sym coff extcoff doxygen clean          \

-clean_list clean_doxygen program debug gdb-config
+clean_list clean_doxygen program debug gdb-config checksource