Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Trigger Distribution
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
White Rabbit Trigger Distribution
Commits
407f25d7
Commit
407f25d7
authored
Jan 25, 2019
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw: rework Makefile variables for pointing to external dependencies
parent
532f38a7
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
47 additions
and
31 deletions
+47
-31
Makefile
software/Makefile
+2
-2
Makefile
software/firmware/Makefile
+1
-1
Makefile
software/firmware/adc/Makefile
+10
-6
Makefile
software/firmware/fd/Makefile
+9
-5
Makefile
software/firmware/tdc/Makefile
+8
-5
.gitignore
software/lib/.gitignore
+2
-0
Makefile
software/lib/Makefile
+4
-3
Makefile
software/stresstests/Makefile
+4
-3
.gitignore
software/tools/.gitignore
+1
-0
Makefile
software/tools/Makefile
+3
-3
Makefile
software/unittest/Makefile
+3
-3
No files found.
software/Makefile
View file @
407f25d7
...
@@ -8,9 +8,9 @@ REPO_PARENT ?= $(CURDIR)/..
...
@@ -8,9 +8,9 @@ REPO_PARENT ?= $(CURDIR)/..
# This can be overriden in cases where WRTD itself is a dependency
# This can be overriden in cases where WRTD itself is a dependency
# and one does not want to recursively check out WRTD's dependency
# and one does not want to recursively check out WRTD's dependency
# on Mock Turtle.
# on Mock Turtle.
DEP_MT
?=
$(CURDIR)
/../dependencies/mock-turtle
WRTD_DEP_TRTL
?=
$(CURDIR)
/../dependencies/mock-turtle
DIRS
=
$(
DEP_MT)
/software lib tools firmware unittest
DIRS
=
$(
WRTD_DEP_TRTL)
/software lib tools firmware
all clean
:
$(DIRS)
all clean
:
$(DIRS)
...
...
software/firmware/Makefile
View file @
407f25d7
-include
Makefile.specific
-include
Makefile.specific
DIRS
:=
tdc fd
DIRS
:=
tdc fd
adc
all clean cleanall modules install modules_install
:
$(DIRS)
all clean cleanall modules install modules_install
:
$(DIRS)
...
...
software/firmware/adc/Makefile
View file @
407f25d7
...
@@ -3,19 +3,23 @@
...
@@ -3,19 +3,23 @@
OBJS
:=
wrtd-rt-adc.o
OBJS
:=
wrtd-rt-adc.o
OUTPUT
=
wrtd-rt-adc
OUTPUT
=
wrtd-rt-adc
TRTL
?=
../../../dependencies/mock-turtle/
WRTD_DEP_TRTL
?=
../../../dependencies/mock-turtle/
TRTL_SW
=
$(TRTL)
/software
WRTD_DEP_FMC_ADC
?=
../../../dependencies/fmc-adc-100m14b4cha-gw
WRTD_DEP_GEN_CORES
?=
../../../dependencies/general-cores
EXTRA2_CFLAGS
=
# To be set by user on make line
EXTRA2_CFLAGS
=
# To be set by user on make line
EXTRA_CFLAGS
+=
-I
../../include
-I
../common
\
EXTRA_CFLAGS
+=
-I
../../include
-I
../common
\
-I
../../../dependencies/fmc-adc-100m14b4cha-gw
/hdl/rtl/wb_gen/
\
-I
$(WRTD_DEP_FMC_ADC)
/hdl/rtl/wb_gen/
\
-Werror
$(EXTRA2_CFLAGS)
-Werror
$(EXTRA2_CFLAGS)
vpath
%.c
../
vpath
%.c
../
MEM_INIT_GEN
=
../../../dependencies/general-cores
/tools/mem_init_gen.py
MEM_INIT_GEN
=
$(WRTD_DEP_GEN_CORES)
/tools/mem_init_gen.py
$(OUTPUT).bram
:
$(OUTPUT).bin
$(OUTPUT).bram
:
$(OUTPUT).bin
python
$(MEM_INIT_GEN)
-i
$<
>
$@
python
$(MEM_INIT_GEN)
-i
$<
>
$@
include
$(TRTL_SW)/firmware/Makefile
TRTL
=
$(WRTD_DEP_TRTL)
TRTL_SW
=
$(TRTL)
/software
include
$(WRTD_DEP_TRTL)/software/firmware/Makefile
software/firmware/fd/Makefile
View file @
407f25d7
...
@@ -4,17 +4,21 @@ OBJS := wrtd-rt-fd.o
...
@@ -4,17 +4,21 @@ OBJS := wrtd-rt-fd.o
OBJS
+=
fd-acam.o fd-gpio.o fd-pll.o fd-i2c.o fd-calibrate.o fd-init.o
OBJS
+=
fd-acam.o fd-gpio.o fd-pll.o fd-i2c.o fd-calibrate.o fd-init.o
OBJDIR
+=
common
OBJDIR
+=
common
OUTPUT
=
wrtd-rt-fd
OUTPUT
=
wrtd-rt-fd
TRTL
?=
../../../dependencies/mock-turtle/
TRTL_SW
=
$(TRTL)
/software
EXTRA2_CFLAGS
=
# To be set by user on make line
WRTD_DEP_TRTL
?=
../../../dependencies/mock-turtle/
WRTD_DEP_GEN_CORES
?=
../../../dependencies/general-cores
EXTRA2_CFLAGS
=
# To be set by user on make line
EXTRA_CFLAGS
+=
-I
../../include
-I
../common
-Werror
-Wall
$(EXTRA2_CFLAGS)
EXTRA_CFLAGS
+=
-I
../../include
-I
../common
-Werror
-Wall
$(EXTRA2_CFLAGS)
vpath
%.c
../
vpath
%.c
../
MEM_INIT_GEN
=
../../../dependencies/general-cores
/tools/mem_init_gen.py
MEM_INIT_GEN
=
$(WRTD_DEP_GEN_CORES)
/tools/mem_init_gen.py
$(OUTPUT).bram
:
$(OUTPUT).bin
$(OUTPUT).bram
:
$(OUTPUT).bin
python
$(MEM_INIT_GEN)
-i
$<
>
$@
python
$(MEM_INIT_GEN)
-i
$<
>
$@
include
$(TRTL_SW)/firmware/Makefile
TRTL
=
$(WRTD_DEP_TRTL)
TRTL_SW
=
$(TRTL)
/software
include
$(WRTD_DEP_TRTL)/software/firmware/Makefile
software/firmware/tdc/Makefile
View file @
407f25d7
...
@@ -3,17 +3,20 @@
...
@@ -3,17 +3,20 @@
OBJS
:=
wrtd-rt-tdc.o
OBJS
:=
wrtd-rt-tdc.o
OUTPUT
=
wrtd-rt-tdc
OUTPUT
=
wrtd-rt-tdc
TRTL
?=
../../../dependencies/mock-turtle/
WRTD_DEP_TRTL
?=
../../../dependencies/mock-turtle/
TRTL_SW
=
$(TRTL)
/software
WRTD_DEP_GEN_CORES
?=
../../../dependencies/general-cores
EXTRA2_CFLAGS
=
# To be set by user on make line
EXTRA2_CFLAGS
=
# To be set by user on make line
EXTRA_CFLAGS
+=
-I
../../include
-I
../common
-Werror
$(EXTRA2_CFLAGS)
EXTRA_CFLAGS
+=
-I
../../include
-I
../common
-Werror
$(EXTRA2_CFLAGS)
vpath
%.c
../
vpath
%.c
../
MEM_INIT_GEN
=
../../../dependencies/general-cores
/tools/mem_init_gen.py
MEM_INIT_GEN
=
$(WRTD_DEP_GEN_CORES)
/tools/mem_init_gen.py
$(OUTPUT).bram
:
$(OUTPUT).bin
$(OUTPUT).bram
:
$(OUTPUT).bin
python
$(MEM_INIT_GEN)
-i
$<
>
$@
python
$(MEM_INIT_GEN)
-i
$<
>
$@
include
$(TRTL_SW)/firmware/Makefile
TRTL
=
$(WRTD_DEP_TRTL)
TRTL_SW
=
$(TRTL)
/software
include
$(WRTD_DEP_TRTL)/software/firmware/Makefile
software/lib/.gitignore
0 → 100644
View file @
407f25d7
*.d
*.a
software/lib/Makefile
View file @
407f25d7
...
@@ -8,13 +8,14 @@
...
@@ -8,13 +8,14 @@
REPO_PARENT
?=
..
REPO_PARENT
?=
..
-include
$(REPO_PARENT)/parent_common.mk
-include
$(REPO_PARENT)/parent_common.mk
TRTL
?=
../../dependencies/mock-turtle/software
WRTD_DEP_TRTL
?=
../../dependencies/mock-turtle/
WRTD_DEP_FMC_ADC
?=
../../dependencies/fmc-adc-100m14b4cha-gw
LIB
=
libwrtd.a
LIB
=
libwrtd.a
OBJS
:=
libwrtd-base.o libwrtd-devices.o libwrtd-attributes.o libwrtd-rules.o
OBJS
:=
libwrtd-base.o libwrtd-devices.o libwrtd-attributes.o libwrtd-rules.o
INCFLAGS
=
-I
.
-I
../include
-I
$(
TRTL)
/include
-I
$(TRTL)
/lib
\
INCFLAGS
=
-I
.
-I
../include
-I
$(
WRTD_DEP_TRTL)
/software/include
\
-I
../firmware/tdc
-I
../../dependencies/fmc-adc-100m14b4cha-gw
/hdl/rtl/wb_gen/
-I
$(WRTD_DEP_TRTL)
/software/lib
-I
../firmware/tdc
-I
$(WRTD_DEP_FMC_ADC)
/hdl/rtl/wb_gen/
CFLAGS
+=
-fno-strict-aliasing
$(INCFLAGS)
CFLAGS
+=
-fno-strict-aliasing
$(INCFLAGS)
CFLAGS
+=
-Wall
-Werror
CFLAGS
+=
-Wall
-Werror
...
...
software/stresstests/Makefile
View file @
407f25d7
...
@@ -8,12 +8,13 @@
...
@@ -8,12 +8,13 @@
REPO_PARENT
?=
..
REPO_PARENT
?=
..
-include
$(REPO_PARENT)/parent_common.mk
-include
$(REPO_PARENT)/parent_common.mk
TRTL
?=
../../dependencies/mock-turtle/software
WRTD_DEP_TRTL
?=
../../../dependencies/mock-turtle/
CFLAGS
+=
-Wall
-g
-O0
CFLAGS
+=
-Wall
-g
-O0
CFLAGS
+=
-I
.
-I
../include
-I
$(TRTL)
/include
-I
$(TRTL)
/lib
-I
../lib
CFLAGS
+=
-I
.
-I
../include
-I
$(WRTD_DEP_TRTL)
/software/include
\
-I
$(WRTD_DEP_TRTL)
/software/lib
-I
../lib
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
LDLIBS
+=
../lib/libwrtd.a
$(
TRTL)
/lib/libmockturtle.a
LDLIBS
+=
../lib/libwrtd.a
$(
WRTD_DEP_TRTL)
/software
/lib/libmockturtle.a
PROGS
=
wrtd-timetest wrtd-freqmeter
PROGS
=
wrtd-timetest wrtd-freqmeter
...
...
software/tools/.gitignore
View file @
407f25d7
...
@@ -2,3 +2,4 @@ wrtd-boot
...
@@ -2,3 +2,4 @@ wrtd-boot
wrtd-in-config
wrtd-in-config
wrtd-out-config
wrtd-out-config
wrtd-logging
wrtd-logging
wrtd-config
software/tools/Makefile
View file @
407f25d7
...
@@ -10,13 +10,13 @@ REPO_PARENT ?= ..
...
@@ -10,13 +10,13 @@ REPO_PARENT ?= ..
DESTDIR
?=
/usr/local
DESTDIR
?=
/usr/local
TRTL
?=
../../dependencies/mock-turtle/software
WRTD_DEP_TRTL
?=
../../dependencies/mock-turtle/
CFLAGS
+=
-Wall
-Werror
-ggdb
CFLAGS
+=
-Wall
-Werror
-ggdb
CFLAGS
+=
-I
.
-I
../include
-I
$(
TRTL)
/include
-I
$(TRTL)
/lib
-I
../lib
CFLAGS
+=
-I
.
-I
../include
-I
$(
WRTD_DEP_TRTL)
/software/include
-I
$(WRTD_DEP_TRTL)
/software
/lib
-I
../lib
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
LDLIBS
+=
../lib/libwrtd.a
$(
TRTL)
/lib/libmockturtle.a
LDLIBS
+=
../lib/libwrtd.a
$(
WRTD_DEP_TRTL)
/software
/lib/libmockturtle.a
PROGS
:=
wrtd-boot wrtd-config wrtd-logging
PROGS
:=
wrtd-boot wrtd-config wrtd-logging
#PROGS += wrtd-in-config
#PROGS += wrtd-in-config
...
...
software/unittest/Makefile
View file @
407f25d7
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
REPO_PARENT
?=
..
REPO_PARENT
?=
..
-include
$(REPO_PARENT)/parent_common.mk
-include
$(REPO_PARENT)/parent_common.mk
TRTL
?=
../../dependencies/mock-turtle/softwar
e
WRTD_DEP_TRTL
?=
../../dependencies/mock-turtl
e
CFLAGS
+=
-Wall
-ggdb
-O0
CFLAGS
+=
-Wall
-ggdb
-O0
CFLAGS
+=
-I
.
-I
../include
-I
$(
TRTL)
/include
-I
$(TRTL)
/lib
-I
../lib
CFLAGS
+=
-I
.
-I
../include
-I
$(
WRTD_DEP_TRTL)
/software/include
-I
$(WRTD_DEP_TRTL)
/software
/lib
-I
../lib
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
CFLAGS
+=
$(EXTRACFLAGS)
LDLIBS
+=
-Wl
,-Bstatic
-L
../lib
-lwrtd
-L
$(
TRTL)
/lib
-lmockturtle
LDLIBS
+=
-Wl
,-Bstatic
-L
../lib
-lwrtd
-L
$(
WRTD_DEP_TRTL)
/software
/lib
-lmockturtle
LDLIBS
+=
-Wl
,-Bdynamic
LDLIBS
+=
-Wl
,-Bdynamic
PROG
:=
wrtd-ut
PROG
:=
wrtd-ut
...
...
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