Add make targets for flashing (Windows version untested)

diff --git a/Makefile b/Makefile
index 458ad7ab0053afccb4a2aea3afa8d7190053622e..287dc0418101e88f00fa87c0d9ada7d68b04ed1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,41 @@ else
 HOST_BINARY=winsrc
 endif
 
 HOST_BINARY=winsrc
 endif
 

-all clean: %:
-       $(MAKE) -C bootrom $@
-       $(MAKE) -C armsrc $@
-       $(MAKE) -C $(HOST_BINARY) $@
+all clean: %: bootrom/% armsrc/% $(HOST_BINARY)/%

 
 

-.PHONY: all clean help _test
+bootrom/%: FORCE
+       $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
+armsrc/%: FORCE
+       $(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
+linux/%: FORCE
+       $(MAKE) -C linux $(patsubst linux/%,%,$@)
+winsrc/%: FORCE
+       $(MAKE) -C winsrc $(patsubst winsrc/%,%,$@)
+FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
+
+
+.PHONY: all clean help _test flash-bootrom flash-os flash-both flash-all FORCE

 help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
 help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:

-       @echo + all   - Make bootrom, armsrc and the OS-specific host directory 
-       @echo + clean - Clean in bootrom, armsrc and the OS-specific host directory
+       @echo + all           - Make bootrom, armsrc and the OS-specific host directory
+       @echo + flash-bootrom - Make bootrom and flash it
+       @echo + flash-os      - Make armsrc and flash os
+       @echo + flash-both    - Make armsrc and flash os and fpga image
+       @echo + flash-all     - Make bootrom and armsrc and flash bootrom, os and fpga image
+       @echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
+
+flash-bootrom: bootrom/obj/bootrom.s19 $(FLASH_TOOL)
+       $(FLASH_TOOL) bootrom $(subst /,$(PATHSEP),$<)
+
+flash-os: armsrc/obj/osimage.s19 $(FLASH_TOOL)
+       $(FLASH_TOOL) os $(subst /,$(PATHSEP),$<)
+
+flash-both: armsrc/obj/osimage.s19 armsrc/obj/fpgaimage.s19 $(FLASH_TOOL)
+       $(FLASH_TOOL) os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+
+flash-all: bootrom/obj/bootrom.s19 armsrc/obj/osimage.s19 armsrc/obj/fpgaimage.s19 $(FLASH_TOOL)
+       $(FLASH_TOOL) bootrom,os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))

 
 # Dummy target to test for GNU make availability
 _test:
 
 # Dummy target to test for GNU make availability
 _test:

diff --git a/common/Makefile.common b/common/Makefile.common
index 144bee4387ae3a12d4fe070b2df82ac04519ee7c..93e14589ff3db6874058003d2b7000bfecb592d8 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -22,6 +22,7 @@ DELETE=rm -rf
 MOVE=mv
 COPY=cp
 PATHSEP=/
 MOVE=mv
 COPY=cp
 PATHSEP=/

+FLASH_TOOL=linux/flasher

 DETECTED_OS=Linux
 # You may/should set this in your environment
 ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork
 DETECTED_OS=Linux
 # You may/should set this in your environment
 ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork


@@ -35,6 +36,7 @@ MOVE=ren
 COPY=copy
 PATHSEP=\\#
 ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
 COPY=copy
 PATHSEP=\\#
 ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork

+FLASH_TOOL=winsrc\\prox.exe

 DETECTED_OS=Windows
 
 endif
 DETECTED_OS=Windows
 
 endif