Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC DEL 1ns 4cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
FMC DEL 1ns 4cha - Software
Commits
b95ffcb8
Commit
b95ffcb8
authored
Nov 28, 2017
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove spec-sw - it is not a dependency
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
f7ada4d7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
19 deletions
+5
-19
.gitmodules
.gitmodules
+0
-3
Makefile
Makefile
+4
-14
Makefile
kernel/Makefile
+1
-1
spec-sw
spec-sw
+0
-1
No files found.
.gitmodules
View file @
b95ffcb8
...
...
@@ -4,6 +4,3 @@
[submodule "fmc-bus"]
path = fmc-bus
url = git://ohwr.org/fmc-projects/fmc-bus.git
[submodule "spec-sw"]
path = spec-sw
url = git://ohwr.org/fmc-projects/spec/spec-sw.git
Makefile
View file @
b95ffcb8
...
...
@@ -12,26 +12,22 @@ export CONFIG_WR_NIC
# The user can override, using environment variables, all these three:
FMC_BUS
?=
fmc-bus
ZIO
?=
zio
SPEC_SW
?=
spec-sw
# FMC_BUS_ABS
, ZIO_ABS and SPEC_SW
_ABS has to be absolut path, due to beeing
# FMC_BUS_ABS
and ZIO
_ABS has to be absolut path, due to beeing
# passed to the Kbuild
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
ZIO_ABS
?=
$
(
abspath
$(ZIO)
)
SPEC_SW_ABS
?=
$
(
abspath
$(SPEC_SW)
)
export
FMC_BUS_ABS
export
ZIO_ABS
export
SPEC_SW_ABS
ZIO_VERSION
=
$(
shell
cd
$(ZIO_ABS)
;
git describe
--always
--dirty
--long
--tags
)
export
ZIO_VERSION
DIRS
=
$(FMC_BUS_ABS)
$(ZIO_ABS)
$(SPEC_SW_ABS)
kernel lib tools
DIRS
=
$(FMC_BUS_ABS)
$(ZIO_ABS)
kernel lib tools
$(SPEC_SW_ABS)
:
$(FMC_BUS_ABS)
kernel
:
$(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS)
kernel
:
$(FMC_BUS_ABS) $(ZIO_ABS)
lib
:
$(ZIO_ABS)
tools
:
lib
...
...
@@ -54,7 +50,7 @@ $(DIRS):
$(MAKE)
-C
$@
$(TARGET)
SUBMOD
=
$(FMC_BUS_ABS)
$(ZIO_ABS)
$(SPEC_SW_ABS)
SUBMOD
=
$(FMC_BUS_ABS)
$(ZIO_ABS)
prereq_install_warn
:
@
test
-f
.prereq_installed
||
\
...
...
@@ -66,7 +62,6 @@ prereq_install:
$(FMC_BUS_ABS)
:
fmc-bus-init_repo
$(ZIO_ABS)
:
zio-init_repo
$(SPEC_SW_ABS)
:
spec-sw-init_repo
# init submodule if missing
fmc-bus-init_repo
:
...
...
@@ -76,9 +71,4 @@ fmc-bus-init_repo:
zio-init_repo
:
@
test
-d
$(ZIO_ABS)
/doc
||
(
echo
"Checking out submodule
$(ZIO_ABS)
"
&&
git submodule update
--init
$(ZIO_ABS)
)
# init submodule if missing
spec-sw-init_repo
:
@
test
-d
$(SPEC_SW_ABS)
/doc
||
(
echo
"Checking out submodule
$(SPEC_SW_ABS)
"
&&
git submodule update
--init
$(SPEC_SW_ABS)
)
include
scripts/gateware.mk
kernel/Makefile
View file @
b95ffcb8
...
...
@@ -8,7 +8,7 @@ LINUX ?= /lib/modules/$(shell uname -r)/build
FMC_BUS
?=
../fmc-bus
ZIO
?=
../zio
# FMC_BUS_ABS
, ZIO_ABS and SPEC_SW
_ABS has to be absolut path, due to beeing
# FMC_BUS_ABS
and ZIO
_ABS has to be absolut path, due to beeing
# passed to the Kbuild
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
ZIO_ABS
?=
$
(
abspath
$(ZIO)
)
...
...
spec-sw
@
5f15d26e
Subproject commit 5f15d26e0e90a0e22f520a7185a940003bac799c
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