Updated makefiles to reflect new dfu-ee programming target invocations (supplied...

[pub/USBasp.git] / Projects / AVRISP_Programmer / makefile

diff --git a/Projects/AVRISP_Programmer/makefile b/Projects/AVRISP_Programmer/makefile
index d6617dc..1ef7370 100644 (file)
--- a/Projects/AVRISP_Programmer/makefile
+++ b/Projects/AVRISP_Programmer/makefile
@@ -90,6 +90,20 @@ BOARD  = USBKEY
 F_CPU = 8000000\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). 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 = 8000000\r
+\r
+\r
 # Output format. (can be srec, ihex, binary)\r
 FORMAT = ihex\r
 \r
@@ -161,8 +175,9 @@ CSTANDARD = -std=gnu99
 \r
 \r
 # Place -D or -U options here for C sources\r
-CDEFS  = -DF_CPU=$(F_CPU)UL -DBOARD=BOARD_$(BOARD) -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS\r
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)\r
+CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY\r
+CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
@@ -521,10 +536,10 @@ flip-ee: $(TARGET).hex $(TARGET).eep
        batchisp -hardware usb -device $(MCU) -operation start reset 0\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
+\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
@@ -663,10 +678,11 @@ clean: begin clean_list clean_binary end
 \r
 clean_binary:\r
        $(REMOVE) $(TARGET).hex\r
-\r
+       \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
@@ -701,4 +717,4 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 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 dfu flip\r
+gdb-config doxygen dfu flip flip-ee dfu-ee\r