improve build process by adding new features to Makefiles

Signed-off-by: Stephan Baerwolf <stephan.baerwolf@tu-ilmenau.de>

diff --git a/Makefile b/Makefile
index 6e24fc8..21e5b75 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,15 @@ include Makefile.inc
 
 all: do_firmware do_updater
 
 
 all: do_firmware do_updater
 

+flash: firmware
+       $(MAKE) -C firmware flash
+fuse:  firmware
+       $(MAKE) -C firmware fuse
+lock:  firmware
+       $(MAKE) -C firmware lock
+update:        updater
+       $(MAKE) -C updater flash
+

 firmware: do_firmware
 updater: do_updater
 
 firmware: do_firmware
 updater: do_updater
 


@@ -20,7 +29,7 @@ do_firmware:
        $(ECHO) "."
        $(MAKE) -C firmware all
 
        $(ECHO) "."
        $(MAKE) -C firmware all
 

-do_updater:
+do_updater: firmware

        $(ECHO) "."
        $(ECHO) "."
        $(ECHO) "======>BUILDING BOOTLOADER UPDATER (EXPERIMENTAL)"
        $(ECHO) "."
        $(ECHO) "."
        $(ECHO) "======>BUILDING BOOTLOADER UPDATER (EXPERIMENTAL)"

diff --git a/Makefile.inc b/Makefile.inc
index e788669..3aba60e 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -312,7 +312,7 @@ NEW_BOOTLOADER_ADDRESS = $(BOOTLOADER_ADDRESS)
 
 # Tools:
 AVRPATH = $(AVR8TOOLCHAINBINDIR)
 
 # Tools:
 AVRPATH = $(AVR8TOOLCHAINBINDIR)

-AVRDUDE = @echo avrdude $(PROGRAMMER) -p $(DEVICE)
+AVRDUDE = $(AVRDUDEBINDIR)avrdude $(PROGRAMMER) -p $(DEVICE)

 
 ECHO=@echo
 GCC=@gcc
 
 ECHO=@echo
 GCC=@gcc

diff --git a/firmware/Makefile b/firmware/Makefile
index ba588dd..04bec88 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -40,16 +40,31 @@ all: main.hex
        $(CC) $(CFLAGS) -S $< -o $@
 
 flash: all
        $(CC) $(CFLAGS) -S $< -o $@
 
 flash: all

+       $(ECHO) "."

        $(AVRDUDE) -U flash:w:main.hex:i
        $(AVRDUDE) -U flash:w:main.hex:i

+       $(ECHO) "."
+       $(ECHO) "."

 
 readflash:
 
 readflash:

+       $(ECHO) "."

        $(AVRDUDE) -U flash:r:read.hex:i
        $(AVRDUDE) -U flash:r:read.hex:i

+       $(ECHO) "."
+       $(ECHO) "."
+

 
 fuse:
 
 fuse:

+       $(ECHO) "."

        $(AVRDUDE) $(FUSEOPT)
        $(AVRDUDE) $(FUSEOPT)

+       $(ECHO) "."
+       $(ECHO) "."
+

 
 lock:
 
 lock:

+       $(ECHO) "."

        $(AVRDUDE) $(LOCKOPT)
        $(AVRDUDE) $(LOCKOPT)

+       $(ECHO) "."
+       $(ECHO) "."
+

 
 read_fuses:
        $(UISP) --rd_fuses
 
 read_fuses:
        $(UISP) --rd_fuses

diff --git a/updater/Makefile b/updater/Makefile
index 066c95c..7764cad 100644 (file)
--- a/updater/Makefile
+++ b/updater/Makefile
@@ -36,6 +36,13 @@ endif
 
 all:  updater.hex
 
 
 all:  updater.hex
 

+flash: all
+       $(ECHO) "."
+       $(AVRDUDE) -D -U flash:w:updater.hex:i
+       $(ECHO) "."
+       $(ECHO) "."
+
+

 ../firmware/main.bin:
        $(MAKE) -C ../firmware main.hex
 
 ../firmware/main.bin:
        $(MAKE) -C ../firmware main.hex
 


@@ -60,9 +67,6 @@ updater.hex: updater.elf
        $(ECHO) "."
        $(SIZ) updater.elf
        $(ECHO) "."
        $(ECHO) "."
        $(SIZ) updater.elf
        $(ECHO) "."

-       $(AVRDUDE) -D -U flash:w:updater.hex:i
-       $(ECHO) "."
-

 
 deepclean: clean
        $(RM) *~
 
 deepclean: clean
        $(RM) *~