Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
Mock Turtle
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Mock Turtle
Commits
0c7577e8
Commit
0c7577e8
authored
May 06, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v4.0.0.beta9'
parents
2bd5bcf7
afc2a32e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
18 deletions
+38
-18
Makefile
distribution/Makefile
+3
-4
Makefile
software/Makefile
+2
-2
Makefile
software/firmware/Makefile
+4
-4
mockturtle-rt.h
software/firmware/lib/mockturtle-rt.h
+5
-5
Makefile
software/include/Makefile
+21
-0
sim-verif.c
tests/firmware/sim-verif/sim-verif.c
+3
-3
No files found.
distribution/Makefile
View file @
0c7577e8
...
...
@@ -27,7 +27,7 @@ clean:
wbgen2-headers
:
$(MAKE)
-C
../software/include/hw/
$(MAKE)
-C
../software/include/
mockturtle/
hw/
build-dir
:
@
mkdir
-p
$(BUILD)
...
...
@@ -38,13 +38,12 @@ dkms-tree: build-dir
dkms-src
:
dkms-tree wbgen2-headers
$
(
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/mockturtle-dkms-mkrpm.spec
$
(
$@
_dir
)
@
cp
$(TOP_DIR)
/software/kernel/mockturtle-
*
.[ch]
$
(
$@
_dir
)
@
cp
$(TOP_DIR)
/software/kernel/Makefile
$
(
$@
_dir
)
@
cp
$(TOP_DIR)
/software/include/hw/
*
.h
$
(
$@
_dir
)
/hw
@
cp
$(TOP_DIR)
/software/include/mockturtle.h
$
(
$@
_dir
)
@
cp
-a
$(TOP_DIR)
/software/include/mockturtle
$
(
$@
_dir
)
@
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/^DKMS
\s
[?]=
\s
0/DKMS ?= 1/"
$
(
$@
_dir
)
/Makefile
...
...
software/Makefile
View file @
0c7577e8
...
...
@@ -5,11 +5,11 @@ CURDIR:=$(shell /bin/pwd)
REPO_PARENT
?=
$(CURDIR)
/..
-include
$(REPO_PARENT)/parent_common.mk
DIRS
=
kernel lib tools include
/mockturtle/hw
DIRS
=
kernel lib tools include
all clean modules install modules_install
:
$(DIRS)
headers
:
include
/mockturtle/hw
headers
:
include
kernel lib
:
headers
tools
:
lib
...
...
software/firmware/Makefile
View file @
0c7577e8
...
...
@@ -111,11 +111,11 @@ WBGEN_HEADERS = mockturtle_cpu_csr.h mockturtle_cpu_lr.h
$(addprefix $(TRTL_HDL)/cpu/,$(WBGEN_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/hw/mockturtle_cpu_lr.h
:
$(TRTL_HDL)/cpu/mt_cpu_lr.wb
$(TRTL_SW)/include/
mockturtle/
hw/mockturtle_cpu_csr.h
:
$(TRTL_HDL)/cpu/mt_cpu_csr.wb
$(TRTL_SW)/include/
mockturtle/
hw/mockturtle_cpu_lr.h
:
$(TRTL_HDL)/cpu/mt_cpu_lr.wb
# 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
# create dirs for object files
...
...
@@ -127,7 +127,7 @@ $(OBJDIR_BUILD):
$(OBJS_BUILD)
:
| $(AUTOCONF)
$(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)
)
${
CC
}
$(CFLAGS)
$(LDFLAGS)
-o
$(build_output)
.elf
-nostartfiles
$(OBJS_BUILD)
-T
$(MOCKTURTLE_LDSCRIPT)
...
...
software/firmware/lib/mockturtle-rt.h
View file @
0c7577e8
...
...
@@ -16,14 +16,14 @@
#include <stdarg.h>
#include <generated/autoconf.h>
#include mockturtle/hw/mockturtle_addresses.h>
#include mockturtle/hw/mockturtle_queue.h>
#include mockturtle/hw/mockturtle_endpoint.h>
#include mockturtle/hw/mockturtle_cpu_lr.h>
#include
<
mockturtle/hw/mockturtle_addresses.h>
#include
<
mockturtle/hw/mockturtle_queue.h>
#include
<
mockturtle/hw/mockturtle_endpoint.h>
#include
<
mockturtle/hw/mockturtle_cpu_lr.h>
#include <urv/riscv.h>
#include <mockturtle.h>
#include <mockturtle
/mockturtle
.h>
/**
...
...
software/include/Makefile
0 → 100644
View file @
0c7577e8
PREFIX
?=
/usr/local/
INCLUDEDESTDIR
?=
$(PREFIX)
/include
all
:
$(MAKE)
-C
mockturtle/hw
clean
:
$(MAKE)
-C
mockturtle/hw clean
install
:
all
install
-d
$(INCLUDEDESTDIR)
/mockturtle
install
-D
mockturtle/
*
.h
$(INCLUDEDESTDIR)
/mockturtle
install
-d
$(INCLUDEDESTDIR)
/mockturtle/hw
install
-D
mockturtle/hw/
*
.h
$(INCLUDEDESTDIR)
/mockturtle/hw
uninstall
:
rm
-f
$(INCLUDEDESTDIR)
/mockturtle/hw/
*
rmdir
--ignore-fail-on-non-empty
$(INCLUDEDESTDIR)
/mockturtle/hw
rm
-f
$(INCLUDEDESTDIR)
/mockturtle/
*
rmdir
--ignore-fail-on-non-empty
$(INCLUDEDESTDIR)
/mockturtle
rmdir
--ignore-fail-on-non-empty
$(INCLUDEDESTDIR)
tests/firmware/sim-verif/sim-verif.c
View file @
0c7577e8
...
...
@@ -2,9 +2,9 @@
#include <stdint.h>
#include "mockturtle-rt.h"
#include "hw/mockturtle_addresses.h"
#include "hw/mockturtle_queue.h"
#include "hw/mockturtle_cpu_lr.h"
#include "
mockturtle/
hw/mockturtle_addresses.h"
#include "
mockturtle/
hw/mockturtle_queue.h"
#include "
mockturtle/
hw/mockturtle_cpu_lr.h"
volatile
unsigned
int
counts
[
8
]
__attribute__
((
section
(
".smem"
)));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment