Update the incomplete StandaloneProgrammer project to be compatible with the latest...

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

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 92b63da..6598226 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -67,8 +67,8 @@ BOARD = USBKEY
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #

-#     This will be an integer division of F_CLOCK below, as it is sourced by
-#     F_CLOCK after it has run through any CPU prescalers. Note that this value
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value

 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.
 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.


@@ -76,7 +76,7 @@ F_CPU = 8000000
 
 
 # Input clock frequency.
 
 
 # Input clock frequency.

-#     This will define a symbol, F_CLOCK, in all source code files equal to the
+#     This will define a symbol, F_USB, in all source code files equal to the

 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed
 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed


@@ -86,7 +86,7 @@ F_CPU = 8000000
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.

-F_CLOCK = $(F_CPU)
+F_USB = $(F_CPU)

 
 
 # Starting byte address of the bootloader, as a byte address - computed via the formula
 
 
 # Starting byte address of the bootloader, as a byte address - computed via the formula


@@ -97,6 +97,7 @@ F_CLOCK = $(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)


@@ -142,6 +143,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)                                             \
 


@@ -157,7 +159,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].


@@ -190,7 +192,7 @@ CSTANDARD = -std=c99
 
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL
 
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL

-CDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CDEFS += -DF_USB=$(F_USB)UL

 CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH)
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 CDEFS += $(LUFA_OPTS)
 CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH)
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 CDEFS += $(LUFA_OPTS)


@@ -198,7 +200,7 @@ CDEFS += $(LUFA_OPTS)
 
 # Place -D or -U options here for ASM sources
 ADEFS  = -DF_CPU=$(F_CPU)
 
 # Place -D or -U options here for ASM sources
 ADEFS  = -DF_CPU=$(F_CPU)

-ADEFS += -DF_CLOCK=$(F_CLOCK)UL
+ADEFS += -DF_USB=$(F_USB)UL

 ADEFS += -DBOARD=BOARD_$(BOARD)
 ADEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 ADEFS += $(LUFA_OPTS)
 ADEFS += -DBOARD=BOARD_$(BOARD)
 ADEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 ADEFS += $(LUFA_OPTS)


@@ -206,7 +208,7 @@ ADEFS += $(LUFA_OPTS)
 
 # Place -D or -U options here for C++ sources
 CPPDEFS  = -DF_CPU=$(F_CPU)UL
 
 # Place -D or -U options here for C++ sources
 CPPDEFS  = -DF_CPU=$(F_CPU)UL

-CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CPPDEFS += -DF_USB=$(F_USB)UL

 CPPDEFS += -DBOARD=BOARD_$(BOARD)
 CPPDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 CPPDEFS += $(LUFA_OPTS)
 CPPDEFS += -DBOARD=BOARD_$(BOARD)
 CPPDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 CPPDEFS += $(LUFA_OPTS)


@@ -338,7 +340,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)

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


@@ -686,13 +688,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)
 


@@ -704,5 +715,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