Skip to content

M
Mock Turtle
Commit d69803ad authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw: bugfix wrong header after re-organization 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 3f2b0516
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 16 deletions
distribution/Makefile
View file @ d69803ad
...@@ -27,7 +27,7 @@ clean: ...@@ -27,7 +27,7 @@ clean:
wbgen2-headers: wbgen2-headers:
$(MAKE) -C ../software/include/hw/ $(MAKE) -C ../software/include/mockturtle/hw/
build-dir: build-dir:
@mkdir -p $(BUILD) @mkdir -p $(BUILD)
...@@ -38,13 +38,12 @@ dkms-tree: build-dir ...@@ -38,13 +38,12 @@ dkms-tree: build-dir
dkms-src: dkms-tree wbgen2-headers dkms-src: dkms-tree wbgen2-headers
$(eval $@_dir := $(BUILD_DKMSSOURCE)/$(DRIVER_NAME)-$(VERSION)) $(eval $@_dir := $(BUILD_DKMSSOURCE)/$(DRIVER_NAME)-$(VERSION))
@mkdir -p $($@_dir)/hw @mkdir -p $($@_dir)
@cp $(TOP_DIR)/distribution/dkms.conf $($@_dir) @cp $(TOP_DIR)/distribution/dkms.conf $($@_dir)
@cp $(TOP_DIR)/distribution/mockturtle-dkms-mkrpm.spec $($@_dir) @cp $(TOP_DIR)/distribution/mockturtle-dkms-mkrpm.spec $($@_dir)
@cp $(TOP_DIR)/software/kernel/mockturtle-*.[ch] $($@_dir) @cp $(TOP_DIR)/software/kernel/mockturtle-*.[ch] $($@_dir)
@cp $(TOP_DIR)/software/kernel/Makefile $($@_dir) @cp $(TOP_DIR)/software/kernel/Makefile $($@_dir)
@cp $(TOP_DIR)/software/include/hw/*.h $($@_dir)/hw @cp -a $(TOP_DIR)/software/include/mockturtle $($@_dir)
@cp $(TOP_DIR)/software/include/mockturtle.h $($@_dir)
@cp $(TOP_DIR)/LICENSES/GPL-2.0-or-later.txt $($@_dir)/LICENSE @cp $(TOP_DIR)/LICENSES/GPL-2.0-or-later.txt $($@_dir)/LICENSE
@sed -r -i -e "s/^VERSION\s=\s.*/VERSION = $(VERSION)/" $($@_dir)/Makefile @sed -r -i -e "s/^VERSION\s=\s.*/VERSION = $(VERSION)/" $($@_dir)/Makefile
@sed -r -i -e "s/^DKMS\s[?]=\s0/DKMS ?= 1/" $($@_dir)/Makefile @sed -r -i -e "s/^DKMS\s[?]=\s0/DKMS ?= 1/" $($@_dir)/Makefile
......
software/firmware/Makefile
View file @ d69803ad
...@@ -111,11 +111,11 @@ WBGEN_HEADERS = mockturtle_cpu_csr.h mockturtle_cpu_lr.h ...@@ -111,11 +111,11 @@ WBGEN_HEADERS = mockturtle_cpu_csr.h mockturtle_cpu_lr.h
$(addprefix $(TRTL_HDL)/cpu/,$(WBGEN_FILES)): ; $(addprefix $(TRTL_HDL)/cpu/,$(WBGEN_FILES)): ;
# dependencies between .h and .wb files # dependencies between .h and .wb files
$(TRTL_SW)/include/hw/mockturtle_cpu_csr.h: $(TRTL_HDL)/cpu/mt_cpu_csr.wb $(TRTL_SW)/include/mockturtle/hw/mockturtle_cpu_csr.h: $(TRTL_HDL)/cpu/mt_cpu_csr.wb
$(TRTL_SW)/include/hw/mockturtle_cpu_lr.h: $(TRTL_HDL)/cpu/mt_cpu_lr.wb $(TRTL_SW)/include/mockturtle/hw/mockturtle_cpu_lr.h: $(TRTL_HDL)/cpu/mt_cpu_lr.wb
# target to let wbgen2 to generate headers # target to let wbgen2 to generate headers
$(addprefix $(TRTL_SW)/include/hw/,$(WBGEN_HEADERS)): $(addprefix $(TRTL_SW)/include/mockturtle/hw/,$(WBGEN_HEADERS)):
make -C $(TRTL_SW) headers make -C $(TRTL_SW) headers
# create dirs for object files # create dirs for object files
...@@ -127,7 +127,7 @@ $(OBJDIR_BUILD): ...@@ -127,7 +127,7 @@ $(OBJDIR_BUILD):
$(OBJS_BUILD): | $(AUTOCONF) $(OBJS_BUILD): | $(AUTOCONF)
$(OBJS_BUILD): | $(OBJDIR_BUILD) $(OBJS_BUILD): | $(OBJDIR_BUILD)
$(build_output).elf: $(addprefix $(TRTL_SW)/include/hw/,$(WBGEN_HEADERS)) $(MOCKTURTLE_LDSCRIPT) $(OBJS_BUILD) $(build_output).elf: $(addprefix $(TRTL_SW)/include/mockturtle/hw/,$(WBGEN_HEADERS)) $(MOCKTURTLE_LDSCRIPT) $(OBJS_BUILD)
$(warning $(OBJS_BUILD)) $(warning $(OBJS_BUILD))
${CC} $(CFLAGS) $(LDFLAGS) -o $(build_output).elf -nostartfiles $(OBJS_BUILD) -T $(MOCKTURTLE_LDSCRIPT) ${CC} $(CFLAGS) $(LDFLAGS) -o $(build_output).elf -nostartfiles $(OBJS_BUILD) -T $(MOCKTURTLE_LDSCRIPT)
......
software/firmware/lib/mockturtle-rt.h
View file @ d69803ad
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
#include <stdarg.h> #include <stdarg.h>
#include <generated/autoconf.h> #include <generated/autoconf.h>
#include mockturtle/hw/mockturtle_addresses.h> #include <mockturtle/hw/mockturtle_addresses.h>
#include mockturtle/hw/mockturtle_queue.h> #include <mockturtle/hw/mockturtle_queue.h>
#include mockturtle/hw/mockturtle_endpoint.h> #include <mockturtle/hw/mockturtle_endpoint.h>
#include mockturtle/hw/mockturtle_cpu_lr.h> #include <mockturtle/hw/mockturtle_cpu_lr.h>
#include <urv/riscv.h> #include <urv/riscv.h>
#include <mockturtle.h> #include <mockturtle/mockturtle.h>
/** /**
......
tests/firmware/sim-verif/sim-verif.c
View file @ d69803ad
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#include <stdint.h> #include <stdint.h>
#include "mockturtle-rt.h" #include "mockturtle-rt.h"
#include "hw/mockturtle_addresses.h" #include "mockturtle/hw/mockturtle_addresses.h"
#include "hw/mockturtle_queue.h" #include "mockturtle/hw/mockturtle_queue.h"
#include "hw/mockturtle_cpu_lr.h" #include "mockturtle/hw/mockturtle_cpu_lr.h"
volatile unsigned int counts[8] __attribute__((section(".smem"))); volatile unsigned int counts[8] __attribute__((section(".smem")));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment