Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha
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 ADC 100M 14b 4cha
Commits
9f82917c
Commit
9f82917c
authored
Nov 29, 2017
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
partial revert:
1a18f7be
remove s[pv]ec-sw - they are not a dependency
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
88d39630
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
Makefile
Makefile
+3
-0
Kbuild
kernel/Kbuild
+4
-1
Makefile
kernel/Makefile
+3
-1
fa-svec-core.c
kernel/fa-svec-core.c
+1
-1
No files found.
Makefile
View file @
9f82917c
...
...
@@ -8,15 +8,18 @@ all: kernel tools lib libtools
FMC_BUS
?=
fmc-bus
ZIO
?=
zio
SVEC_SW
?=
svec-sw
# Use the absolute path so it can be used by submodule
# 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)
)
SVEC_SW_ABS
?=
$
(
abspath
$(SVEC_SW)
)
export
FMC_BUS_ABS
export
ZIO_ABS
export
SVEC_SW_ABS
DIRS
=
$(FMC_BUS_ABS)
$(ZIO_ABS)
kernel tools lib libtools
...
...
kernel/Kbuild
View file @
9f82917c
CONFIG_FMC_ADC_SVEC ?= CONFIG_VME
SVEC_SW_EXTRA_SYMBOLS-$(CONFIG_FMC_ADC_SVEC) := $(SVEC_SW_ABS)/kernel/Module.symvers.vmebus
KBUILD_EXTRA_SYMBOLS := \
$(ZIO_ABS)/Module.symvers \
$(FMC_BUS_ABS)/kernel/Module.symvers
$(FMC_BUS_ABS)/kernel/Module.symvers \
$(SVEC_SW_EXTRA_SYMBOLS-y)
# add versions of supermodule. It is useful when fine-delay-sw is included as sub-module
# of a bigger project that we want to track
...
...
@@ -25,6 +27,7 @@ ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\" \
-I$(ZIO_ABS)/include \
-I$(src)
ccflags-$(CONFIG_FMC_ADC_SVEC) += -I$(SVEC_SW_ABS)/kernel
ccflags-$(CONFIG_FMC_ADC_DEBUG) += -DDEBUG
ccflags-$(CONFIG_FMC_ADC_SVEC) += -DCONFIG_FMC_ADC_SVEC
...
...
kernel/Makefile
View file @
9f82917c
...
...
@@ -7,11 +7,13 @@ REPO_PARENT ?= $(CURDIR)/../..
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
FMC_BUS
?=
../fmc-bus
ZIO
?=
../zio
SVEC_SW
?=
../svec-sw
# 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)
)
SVEC_SW_ABS
?=
$
(
abspath
$(SVEC_SW)
)
GIT_VERSION
=
$(
shell
git describe
--always
--dirty
--long
--tags
)
export
GIT_VERSION
...
...
@@ -24,7 +26,7 @@ export ZIO_VERSION
all modules
:
$(MAKE)
-C
$(LINUX)
M
=
$(CURDIR)
FMC_BUS_ABS
=
$(FMC_BUS_ABS)
\
ZIO_ABS
=
$(ZIO_ABS)
modules
ZIO_ABS
=
$(ZIO_ABS)
SVEC_SW_ABS
=
$(SVEC_SW_ABS)
modules
install modules_install
:
modules
$(MAKE)
-C
$(LINUX)
M
=
$(CURDIR)
modules_install
...
...
kernel/fa-svec-core.c
View file @
9f82917c
...
...
@@ -11,8 +11,8 @@
#include <linux/moduleparam.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <svec.h>
#include "fmc-adc-100m14b4cha.h"
#include "fa-svec.h"
...
...
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