Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Network Interface Card
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
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 Network Interface Card
Commits
14d04c93
Commit
14d04c93
authored
Apr 24, 2019
by
Miguel Jimenez Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: Update Makefile to remove fmc-bus compilation stuff.
parent
66939603
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
24 deletions
+4
-24
Makefile
sw/Makefile
+2
-14
Kbuild
sw/kernel/Kbuild
+1
-1
Makefile
sw/kernel/Makefile
+1
-9
No files found.
sw/Makefile
View file @
14d04c93
...
...
@@ -7,13 +7,7 @@ REPO_PARENT=$(shell /bin/pwd)/..
GIT_VERSION
?=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
# by default use the fmc-bus within the repository
FMC_BUS
?=
fmc-bus
# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
export
FMC_BUS_ABS
DIRS
=
$(FMC_BUS_ABS)
kernel
DIRS
=
kernel
.PHONY
:
all clean modules install modules_install $(DIRS)
...
...
@@ -27,10 +21,4 @@ modules_install: TARGET = modules_install
$(DIRS)
:
$(MAKE)
-C
$@
$(TARGET)
$(FMC_BUS_ABS)
:
fmc-bus-init_repo
# init submodule if missing
fmc-bus-init_repo
:
@
test
-d
$(FMC_BUS_ABS)
/doc
||
(
echo
"Checking out submodule
$(FMC_BUS_ABS)
"
;
git submodule update
--init
$(FMC_BUS_ABS)
)
kernel
:
$(FMC_BUS_ABS)
kernel
:
sw/kernel/Kbuild
View file @
14d04c93
...
...
@@ -14,7 +14,7 @@ ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
# The library includes <sdb.h>, so point -I directtly there
# include our header before to avoid conflicts with the kernel
LINUXINCLUDE :=
-I$(FMC_BUS_ABS)/kernel/include
-I$(src)/include/linux $(LINUXINCLUDE)
LINUXINCLUDE := -I$(src)/include/linux $(LINUXINCLUDE)
ccflags-y += -I$(src)/include
ccflags-y += $(WR_NIC_CFLAGS)
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
...
...
sw/kernel/Makefile
View file @
14d04c93
...
...
@@ -5,19 +5,11 @@ REPO_PARENT=$(shell /bin/pwd)/../..
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
# by default use the fmc-bus within the repository
FMC_BUS
?=
../fmc-bus/
# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
GIT_VERSION
?=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
FMC_BUS_VERSION
?=
$(
shell
cd
$(FMC_BUS_ABS)
;
git describe
--always
--dirty
--long
--tags
)
export
FMC_BUS_VERSION
all modules
:
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
/bin/pwd
)
FMC_BUS_ABS
=
$(FMC_BUS_ABS)
modules
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
/bin/pwd
)
modules
install modules_install
:
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
/bin/pwd
)
modules_install
...
...
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