sw:fw: update build system to use latest version of MT

5de81645 · Dimitris Lampridis · 892d208f · 8d4e5c18 · d7779597 · 5de81645
Commit 5de81645 authored Apr 11, 2019 by Dimitris Lampridis
9 changed files
--- a/general-cores @ 8d4e5c18
+++ b/general-cores @ 8d4e5c18
-Subproject commit caad0595a00d6f69aa59993a790c1aa3c8fd691f
+Subproject commit 8d4e5c18c6f80f1c1c588bb9000c45da656788cd
--- a/mock-turtle @ d7779597
+++ b/mock-turtle @ d7779597
-Subproject commit 59a2c707c28ea99ee15a17eb1f1c903f6644c7b1
+Subproject commit d7779597eee20a31f470f0cb993f104c72a9d090
--- a/software/firmware/.gitignore
+++ b/software/firmware/.gitignore
@@ -3,6 +3,7 @@
 *.o
 *.d
 *.bram
+Makefile.specific
 build/
 .config
 .config.old
--- a/software/firmware/adc/Makefile
+++ b/software/firmware/adc/Makefile
 -include Makefile.specific

-OBJS := wrtd-rt-adc.o
-OUTPUT = wrtd-rt-adc
+CUR_DIR := $(shell pwd)

-WRTD_DEP_TRTL      ?= ../../../dependencies/mock-turtle/
-WRTD_DEP_FMC_ADC   ?= ../../../dependencies/fmc-adc-100m14b4cha-gw
-WRTD_DEP_GEN_CORES ?= ../../../dependencies/general-cores
+WRTD_DEP_TRTL_FW   ?= $(CUR_DIR)/../../../dependencies/mock-turtle/software/firmware
+WRTD_DEP_FMC_ADC   ?= $(CUR_DIR)/../../../dependencies/fmc-adc-100m14b4cha-gw
+WRTD_DEP_GEN_CORES ?= $(CUR_DIR)/../../../dependencies/general-cores

-EXTRA2_CFLAGS =  # To be set by user on make line
-EXTRA_CFLAGS += -I../../include -I../common \
-  -I$(WRTD_DEP_FMC_ADC)/hdl/rtl/wb_gen/ \
-  -Werror $(EXTRA2_CFLAGS)
+EXTRA2_CFLAGS +=  # To be set by user on make line
+EXTRA_CFLAGS  += $(EXTRA2_CFLAGS)
+EXTRA_CFLAGS  += -I$(CUR_DIR)/../../include
+EXTRA_CFLAGS  += -I$(CUR_DIR)/../common
+EXTRA_CFLAGS  += -I$(WRTD_DEP_FMC_ADC)/hdl/rtl/wb_gen

-vpath %.c ../
+all:

-MEM_INIT_GEN = $(WRTD_DEP_GEN_CORES)/tools/mem_init_gen.py
-
-$(OUTPUT).bram: $(OUTPUT).bin
-	python $(MEM_INIT_GEN) -i $< > $@
-
-TRTL    = $(WRTD_DEP_TRTL)
-TRTL_SW = $(TRTL)/software
-
-include $(WRTD_DEP_TRTL)/software/firmware/Makefile
+# Redirect all rules to MockTurtle
+%:
+	$(MAKE) -C $(WRTD_DEP_TRTL_FW) M=$(shell /bin/pwd) \
+		GEN_CORES=$(WRTD_DEP_GEN_CORES) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" $@
--- a/software/firmware/adc/TBuild
+++ b/software/firmware/adc/TBuild
+OBJS  := wrtd-rt-adc.o
+OUTPUT = wrtd-rt-adc
--- a/software/firmware/fd/Makefile
+++ b/software/firmware/fd/Makefile
 -include Makefile.specific

-OBJS := wrtd-rt-fd.o
-OBJS += fd-acam.o fd-gpio.o fd-pll.o fd-i2c.o fd-calibrate.o fd-init.o
-OBJDIR += common
-OUTPUT = wrtd-rt-fd
+CUR_DIR := $(shell pwd)

-WRTD_DEP_TRTL      ?= ../../../dependencies/mock-turtle/
-WRTD_DEP_GEN_CORES ?= ../../../dependencies/general-cores
+WRTD_DEP_TRTL_FW   ?= $(CUR_DIR)/../../../dependencies/mock-turtle/software/firmware
+WRTD_DEP_GEN_CORES ?= $(CUR_DIR)/../../../dependencies/general-cores

-EXTRA2_CFLAGS =  # To be set by user on make line
-EXTRA_CFLAGS += -I../../include -I../common -Werror -Wall $(EXTRA2_CFLAGS)
+EXTRA2_CFLAGS += # To be set by user on make line
+EXTRA_CFLAGS  += $(EXTRA2_CFLAGS)
+EXTRA_CFLAGS  += -I$(CUR_DIR)/../../include
+EXTRA_CFLAGS  += -I$(CUR_DIR)/../common

-vpath %.c ../
+all:

-MEM_INIT_GEN = $(WRTD_DEP_GEN_CORES)/tools/mem_init_gen.py
-
-$(OUTPUT).bram: $(OUTPUT).bin
-	python $(MEM_INIT_GEN) -i $< > $@
-
-TRTL    = $(WRTD_DEP_TRTL)
-TRTL_SW = $(TRTL)/software
-
-include $(WRTD_DEP_TRTL)/software/firmware/Makefile
+# Redirect all rules to MockTurtle
+%:
+	$(MAKE) -C $(WRTD_DEP_TRTL_FW) M=$(shell /bin/pwd) \
+		GEN_CORES=$(WRTD_DEP_GEN_CORES) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" $@
--- a/software/firmware/fd/TBuild
+++ b/software/firmware/fd/TBuild
+OBJS  := wrtd-rt-fd.o
+OBJS  += fd-acam.o fd-gpio.o fd-pll.o fd-i2c.o fd-calibrate.o fd-init.o
+OUTPUT = wrtd-rt-fd
--- a/software/firmware/tdc/Makefile
+++ b/software/firmware/tdc/Makefile
 -include Makefile.specific

-OBJS := wrtd-rt-tdc.o
-OUTPUT = wrtd-rt-tdc
+CUR_DIR := $(shell pwd)

-WRTD_DEP_TRTL      ?= ../../../dependencies/mock-turtle/
-WRTD_DEP_GEN_CORES ?= ../../../dependencies/general-cores
+WRTD_DEP_TRTL_FW   ?= $(CUR_DIR)/../../../dependencies/mock-turtle/software/firmware
+WRTD_DEP_GEN_CORES ?= $(CUR_DIR)/../../../dependencies/general-cores

-EXTRA2_CFLAGS =  # To be set by user on make line
-EXTRA_CFLAGS += -I../../include -I../common -Werror $(EXTRA2_CFLAGS)
+EXTRA2_CFLAGS += # To be set by user on make line
+EXTRA_CFLAGS  += $(EXTRA2_CFLAGS)
+EXTRA_CFLAGS  += -I$(CUR_DIR)/../../include
+EXTRA_CFLAGS  += -I$(CUR_DIR)/../common

-vpath %.c ../
+all:

-MEM_INIT_GEN = $(WRTD_DEP_GEN_CORES)/tools/mem_init_gen.py
-
-$(OUTPUT).bram: $(OUTPUT).bin
-	python $(MEM_INIT_GEN) -i $< > $@
-
-TRTL    = $(WRTD_DEP_TRTL)
-TRTL_SW = $(TRTL)/software
-
-include $(WRTD_DEP_TRTL)/software/firmware/Makefile
+# Redirect all rules to MockTurtle
+%:
+	$(MAKE) -C $(WRTD_DEP_TRTL_FW) M=$(shell /bin/pwd) \
+		GEN_CORES=$(WRTD_DEP_GEN_CORES) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" $@
--- a/software/firmware/tdc/TBuild
+++ b/software/firmware/tdc/TBuild
+OBJS  := wrtd-rt-tdc.o
+OUTPUT = wrtd-rt-tdc