Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple PCIe FMC carrier SPEC - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
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
Simple PCIe FMC carrier SPEC - Software
Commits
ed6f65c1
Commit
ed6f65c1
authored
Oct 19, 2015
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: get rid of FMC_DRV from Makefiles
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
d40ca8ed
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
Makefile
Makefile
+0
-2
Kbuild
kernel/Kbuild
+2
-2
Makefile
kernel/Makefile
+3
-2
No files found.
Makefile
View file @
ed6f65c1
...
...
@@ -6,8 +6,6 @@ REPO_PARENT=$(shell /bin/pwd)/..
# by default use the fmc-bus within the repository
FMC_BUS
?=
$(
shell
pwd
)
/fmc-bus/
export
FMC_BUS
FMC_DRV
?=
$(FMC_BUS)
/kernel/
export
FMC_DRV
RUNME
:=
$(
shell
test
-d
$(FMC_DRV)
||
git submodule update
--init
)
...
...
kernel/Kbuild
View file @
ed6f65c1
KBUILD_EXTRA_SYMBOLS := $(FMC_
DRV)
/Module.symvers
KBUILD_EXTRA_SYMBOLS := $(FMC_
BUS)/kernel
/Module.symvers
# For this CSM_VERSION, please see ohwr.org/csm documentation
ifdef CONFIG_CSM_VERSION
...
...
@@ -9,7 +9,7 @@ endif
# The library includes <sdb.h>, so point -I directtly there
# include our header before to avoid conflicts with the kernel
LINUXINCLUDE := -I$(FMC_
DRV)
/include -I$(src)/include/linux $(LINUXINCLUDE)
LINUXINCLUDE := -I$(FMC_
BUS)/kernel
/include -I$(src)/include/linux $(LINUXINCLUDE)
ccflags-y += -I$(src)/include
ccflags-y += $(WR_NIC_CFLAGS)
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
...
...
kernel/Makefile
View file @
ed6f65c1
...
...
@@ -7,9 +7,10 @@ LINUX ?= /lib/modules/$(shell uname -r)/build
# by default use the fmc-bus within the repository
FMC_BUS
?=
$(
shell
pwd
)
/../fmc-bus/
FMC_DRV
?=
$(FMC_BUS)
/kernel/
# FMC_DRV has to be absolut path, due to beeing passed to the Kbuild
FMC_DRV
=
$(
shell
realpath
-f
$(FMC_DRV)
)
export
FMC_
DRV
export
FMC_
BUS
GIT_VERSION
=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
...
...
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