Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple VME FMC Carrier SVEC
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
14
Issues
14
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 VME FMC Carrier SVEC
Commits
53354a9d
Commit
53354a9d
authored
Dec 16, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v1.4.6'
parents
35fd11e5
522cb422
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
14 deletions
+11
-14
CHANGELOG.rst
CHANGELOG.rst
+6
-0
Makefile
software/Makefile
+0
-3
Kbuild
software/kernel/Kbuild
+4
-5
Makefile
software/kernel/Makefile
+1
-6
No files found.
CHANGELOG.rst
View file @
53354a9d
...
...
@@ -2,6 +2,12 @@
Change Log
==========
[1.4.6] 2019-12-16
==================
Changed
-----
- [sw] better integration in coht, rename environment variable to FPGA_MGR
[1.4.5] 2019-12-16
==================
Fixed
...
...
software/Makefile
View file @
53354a9d
-include
Makefile.specific
# include parent_common.mk for buildsystem's defines
#use absolute path for REPO_PARENT
REPO_PARENT
?=
$(
shell
/bin/pwd
)
/..
-include
$(REPO_PARENT)/parent_common.mk
DIRS
=
kernel
...
...
software/kernel/Kbuild
View file @
53354a9d
...
...
@@ -7,8 +7,6 @@ endif
endif
# add versions of used submodules
CONFIG_FPGA_MGR_BACKPORT_INCLUDE := -I$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/include
CONFIG_FPGA_MGR_BACKPORT_INCLUDE += -I$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/include/linux
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
...
...
@@ -18,7 +16,6 @@ ccflags-y += -Wall -Werror
ccflags-y += -I$(VMEBRIDGE_ABS)/include
ccflags-y += -I$(FPGA_MGR_ABS)/include
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE)
ccflags-y += -I$(FMC_ABS)/include
ccflags-y += -I$(I2C_ABS)/include
...
...
@@ -27,8 +24,10 @@ ccflags-y += -I$(I2C_ABS)/include
LINUXINCLUDE := -I$(FMC_ABS)/include -I$(FMC_ABS)/include/linux -I$(I2C_ABS)/include -I$(I2C_ABS)/include/linux $(LINUXINCLUDE)
ifeq ($(CONFIG_FPGA_MGR_BACKPORT), y)
LINUXINCLUDE := $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE) $(LINUXINCLUDE)
KBUILD_EXTRA_SYMBOLS += $(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/drivers/fpga/Module.symvers
FPGA_MGR_BACKPORT_INCLUDE := -I$(FPGA_MGR_ABS)/include
FPGA_MGR_BACKPORT_INCLUDE += -I$(FPGA_MGR_ABS)/include/linux
LINUXINCLUDE := $(FPGA_MGR_BACKPORT_INCLUDE) $(LINUXINCLUDE)
KBUILD_EXTRA_SYMBOLS += $(FPGA_MGR_ABS)/drivers/fpga/Module.symvers
endif
KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers
KBUILD_EXTRA_SYMBOLS += $(VMEBRIDGE_ABS)/driver/Module.symvers
...
...
software/kernel/Makefile
View file @
53354a9d
-include
Makefile.specific
# include parent_common.mk for buildsystem's defines
#use absolute path for REPO_PARENT
REPO_PARENT
?=
$(
shell
/bin/pwd
)
/../..
-include
$(REPO_PARENT)/parent_common.mk
TOP_DIR
?=
$(
shell
pwd
)
/../..
...
...
@@ -10,8 +7,6 @@ HDL_DIR ?= $(TOP_DIR)/hdl
KVERSION
?=
$(
shell
uname
-r
)
LINUX
?=
/lib/modules/
$(KVERSION)
/build
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS
?=
$
(
abspath
$(CONFIG_FPGA_MGR_BACKPORT_PATH)
)
VMEBRIDGE_ABS
?=
$
(
abspath
$(VMEBRIDGE)
)
FPGA_MGR_ABS
?=
$
(
abspath
$(FPGA_MGR)
)
FMC_ABS
?=
$
(
abspath
$(FMC)
)
...
...
@@ -37,7 +32,7 @@ modules help coccicheck modules_install: svec-core-fpga.h
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
pwd
)
\
VERSION
=
$(VERSION)
\
VMEBRIDGE_ABS
=
$(VMEBRIDGE_ABS)
\
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS
=
$(CONFIG_FPGA_MGR_BACKPORT_PATH
_ABS)
\
FPGA_MGR_ABS
=
$(FPGA_MGR
_ABS)
\
CONFIG_FPGA_MGR_BACKPORT
=
$(CONFIG_FPGA_MGR_BACKPORT)
\
FMC_ABS
=
$(FMC_ABS)
\
I2C_ABS
=
$(I2C_ABS)
\
...
...
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