Merge branch 'develop'

ef9dd102 · Federico Vaga · aaadc469 · 3462229e · ef9dd102 · ef9dd102
Commit ef9dd102 authored Apr 29, 2019 by Federico Vaga
6 changed files
--- a/software/firmware/Makefile
+++ b/software/firmware/Makefile
@@ -136,10 +136,11 @@ $(build_output).bin: $(build_output).elf
 	$(SIZE) $(build_output).elf

 $(build_output).bram: $(build_output).bin
+ifeq (0 , $(shell test -e $(MEM_INIT_GEN); echo $$?))
 	$(MEM_INIT_GEN) -i $(build_output).bin > $(build_output).bram
-
-$(build_output).bram: $(build_output).bin
-	$(MEM_INIT_GEN) -i $(build_output).bin > $(build_output).bram
+else
+	@echo "Cannot generate \"bram\" file. Missing $(MEM_INIT_GEN)" > /dev/stderr
+endif

 $(BUILDDIR)/urv/emulate.o: urv/emulate.c
 	${CC} $(DEPFLAGS) $(CFLAGS) -march=rv32i -c $< -o $@

--- a/software/tools/trtl-project-creator/templates/software/firmware/common/fw-project-common.h
+++ b/software/tools/trtl-project-creator/templates/software/firmware/common/fw-project-common.h
@@ -6,7 +6,7 @@

 #ifndef __FW_{{short_name_capital}}_COMMON_H__
 #define __FW_{{short_name_capital}}_COMMON_H__
-#include <mockturtle-rt-smem.h>
+#include <mockturtle-rt.h>
 #include <{{short_name}}-common.h>

 #endif
--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/Makefile
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/Makefile
-OBJS = fw-{{short_name}}.o
-OBJS += # add other object files that you need
-OUTPUT = fw-{{short_name}}
-TRTL ?= ../../../mockturtle
+TRTL ?=
 TRTL_SW = $(TRTL)/software
+TRTL_FW = $(TRTL_SW)/firmware

-EXTRA_CFLAGS += -I../../include
-EXTRA_CFLAGS += -I../common
+all:

-include $(TRTL_SW)/firmware/Makefile
+# Redirect all rules to MockTurtle
+%:
+	$(MAKE) -C $(TRTL_FW) M=$(shell /bin/pwd) $@
--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/TBuild
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/TBuild
+OBJS = fw-{{short_name}}.o
+OBJS += # add other object files that you need
+OUTPUT = fw-{{short_name}}
+
+OBJDIR += common
+OBJS += # add other object files from common directory, if any
+
+EXTRA_CFLAGS += -I$(src)/../../include
+EXTRA_CFLAGS += -I$(src)/../common
+
+vpath %.c $(src)/../
--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/fw-project.c
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/fw-project.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <mockturtle-framework.h>
 #include <{{short_name}}-common.h>
+#include <fw-{{short_name}}-common.h>

 enum hmq_slot_name {
 	{{short_name_capital}}_CMD = 0,

--- a/software/tools/trtl-project-creator/trtl-project-creator
+++ b/software/tools/trtl-project-creator/trtl-project-creator
@@ -85,6 +85,7 @@ def tpc_apply_value_to_template(directory, table):
                 "software/firmware/Makefile",
                 "software/firmware/fw-01/Makefile",
                 "software/firmware/fw-01/Kconfig",
+                 "software/firmware/fw-01/TBuild",
                 "software/firmware/fw-01/configs/mt_defconfig",
                 "doc/Makefile",
                 "doc/doxygen-project-config",