Refactoring of the Makefiles.

timvideos · Sep 13, 2015 · 3288471 · 3288471
1 parent 2ef3e6d
commit 3288471
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -16,27 +16,32 @@ else
 	FLTERM = $(MSCDIR)/tools/flterm
 endif
 
+include Makefile.$(TARGET)
+
 help:
-	@echo "Targets avaliable:"
-	@echo " make gateware"
-	@echo " make lm32-firmware"
-	@echo " make fx2-firmware"
-	@echo " make load-gateware"
-	@echo " make load-lm32-firmware"
-	@echo " make load-fx2-firmware"
-	@echo " make clean"
-	@echo " make all"
-	@echo " make connect-lm32"
-	@echo ""
 	@echo "Environment:"
 	@echo "  BOARD=atlys OR opsis  (current: $(BOARD))"
 	@echo " TARGET=base OR hdmi2usb OR hdmi2ethernet"
-	@echo "                        (current: $(TARGET)"
-	@echo " MSCDIR=misoc directory (current: $(MSCDIR))"
+	@echo "                        (current: $(TARGET))"
 	@echo "   PROG=programmer      (current: $(PROG))"
 	@echo " SERIAL=serial port     (current: $(SERIAL))"
+	@echo ""
+	@echo "Targets avaliable:"
+	@echo " make help"
+	@echo " make gateware"
+	@echo " make load-gateware"
+	@echo " make connect-lm32"
+	@make -s help-$(TARGET)
+	@echo " make clean"
+	@echo " make all"
 
-gateware: lm32-firmware
+clean: clean-$(TARGET)
+	cd $(MSCDIR) && $(CMD) clean
+
+load: load-gateware load-$(TARGET)
+
+# Gateware targets
+gateware: gateware-$(TARGET)
 	cd $(MSCDIR) && $(CMD) --csr_csv $(HDMI2USBDIR)/test/csr.csv clean
 	cp hdl/encoder/vhdl/header.hex $(MSCDIR)/build/header.hex
 	cd $(MSCDIR) && $(CMD) --csr_csv $(HDMI2USBDIR)/test/csr.csv build-csr-csv build-bitstream
@@ -47,39 +52,10 @@ load-gateware:
 release-gateware:
 	cd $(MSCDIR)/build && tar -cvzf ../$(HDMI2USBDIR)/$(BOARD)_$(TARGET)_gateware_$(DATE).tar.gz *.bin *.bit
 
-
-ifeq ($(TARGET), base)
-lm32-firmware:
-	cd $(MSCDIR) && $(CMD) build-headers
-	echo "No lm32-firmware for base target."
-else
-lm32-firmware:
-	cd $(MSCDIR) && $(CMD) build-headers
-	$(MAKE) -C firmware/lm32 all
-endif
-
-load-lm32-firmware: lm32-firmware
-	$(FLTERM) --port $(SERIAL) --kernel=firmware/lm32/firmware.bin --kernel-adr=0x20000000 --speed 115200
-
 connect-lm32:
 	$(FLTERM) --port $(SERIAL) --speed 115200
 
-fx2-firmware:
-	$(MAKE) -C firmware/fx2
-
-load-fx2-firmware: fx2-firmware
-	firmware/fx2/download.sh firmware/fx2/hdmi2usb.hex
-
-clean:
-	cd $(MSCDIR) && $(CMD) clean
-	$(MAKE) -C firmware/lm32 clean
-	$(MAKE) -C firmware/fx2 clean
-
-load: load-gateware load-lm32-firmware load-fx2-firmware
-
-view:
-	./scripts/view.sh
-
-all: gateware load-gateware load-fx2-firmware
+# All target
+all: gateware load-gateware load-$(TARGET)
 
 .PHONY: lm32-firmware load clean
diff --git a/Makefile.base b/Makefile.base
@@ -0,0 +1,13 @@
+help-base:
+	true
+
+gateware-base:
+	true
+
+load-base:
+	true
+
+clean-base:
+	true
+
+.PHONY: help-base gateware-base load-base clean-base
diff --git a/Makefile.hdmi2ethernet b/Makefile.hdmi2ethernet
@@ -0,0 +1,28 @@
+help-hdmi2ethernet:
+	@echo " make lm32-firmware"
+	@echo " make load-lm32-firmware"
+
+gateware-hdmi2ethernet: lm32-firmware
+	true
+
+load-hdmi2ethernet: load-lm32-firmware
+	true
+
+clean-hdmi2ethernet: clean-lm32-firmware
+	true
+
+# Firmware for the lm32 softcore
+lm32-firmware:
+	cd $(MSCDIR) && $(CMD) build-headers
+	$(MAKE) -C firmware/lm32 all
+
+load-lm32-firmware: lm32-firmware
+	$(FLTERM) --port $(SERIAL) --kernel=firmware/lm32/firmware.bin --kernel-adr=0x20000000 --speed 115200
+
+clean-lm32-firmware:
+	$(MAKE) -C firmware/lm32 clean
+
+# Utility functions
+
+.PHONY: help-hdmi2ethernet gateware-hdmi2ethernet load-hdmi2ethernet clean-hdmi2ethernet
+.PHONY: lm32-firmware load-lm32-firmware clean-lm32-firmware
diff --git a/Makefile.hdmi2usb b/Makefile.hdmi2usb
@@ -0,0 +1,44 @@
+help-hdmi2usb:
+	@echo " make lm32-firmware"
+	@echo " make load-lm32-firmware"
+	@echo " make fx2-firmware"
+	@echo " make load-fx2-firmware"
+	@echo " make view"
+
+gateware-hdmi2usb: lm32-firmware
+	true
+
+load-hdmi2usb: load-lm32-firmware
+	true
+
+clean-hdmi2usb: clean-lm32-firmware clean-fx2-firmware
+	true
+
+# Firmware for the lm32 softcore
+lm32-firmware:
+	cd $(MSCDIR) && $(CMD) build-headers
+	$(MAKE) -C firmware/lm32 all
+
+load-lm32-firmware: lm32-firmware
+	$(FLTERM) --port $(SERIAL) --kernel=firmware/lm32/firmware.bin --kernel-adr=0x20000000 --speed 115200
+
+clean-lm32-firmware:
+	$(MAKE) -C firmware/lm32 clean
+
+# Firmware for the Cypress FX2
+fx2-firmware:
+	$(MAKE) -C firmware/fx2
+
+load-fx2-firmware: fx2-firmware
+	firmware/fx2/download.sh firmware/fx2/hdmi2usb.hex
+
+clean-fx2-firmware:
+	$(MAKE) -C firmware/fx2 clean
+
+# Utility functions
+view:
+	./scripts/view.sh
+
+.PHONY: help-hdmi2usb gateware-hdmi2usb load-hdmi2usb clean-hdmi2usb
+.PHONY: lm32-firmware load-lm32-firmware clean-lm32-firmware
+.PHONY: fx2-firmware load-fx2-firmware clean-fx2-firmware