Commit 53354a9d authored by Federico Vaga's avatar Federico Vaga

Merge branch 'release/v1.4.6'

parents 35fd11e5 522cb422
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
Change Log 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 [1.4.5] 2019-12-16
================== ==================
Fixed Fixed
......
-include Makefile.specific -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 -include $(REPO_PARENT)/parent_common.mk
DIRS = kernel DIRS = kernel
......
...@@ -7,8 +7,6 @@ endif ...@@ -7,8 +7,6 @@ endif
endif endif
# add versions of used submodules # 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)" ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
...@@ -18,7 +16,6 @@ ccflags-y += -Wall -Werror ...@@ -18,7 +16,6 @@ ccflags-y += -Wall -Werror
ccflags-y += -I$(VMEBRIDGE_ABS)/include ccflags-y += -I$(VMEBRIDGE_ABS)/include
ccflags-y += -I$(FPGA_MGR_ABS)/include ccflags-y += -I$(FPGA_MGR_ABS)/include
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT 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$(FMC_ABS)/include
ccflags-y += -I$(I2C_ABS)/include ccflags-y += -I$(I2C_ABS)/include
...@@ -27,8 +24,10 @@ 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) 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) ifeq ($(CONFIG_FPGA_MGR_BACKPORT), y)
LINUXINCLUDE := $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE) $(LINUXINCLUDE) FPGA_MGR_BACKPORT_INCLUDE := -I$(FPGA_MGR_ABS)/include
KBUILD_EXTRA_SYMBOLS += $(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/drivers/fpga/Module.symvers 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 endif
KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers
KBUILD_EXTRA_SYMBOLS += $(VMEBRIDGE_ABS)/driver/Module.symvers KBUILD_EXTRA_SYMBOLS += $(VMEBRIDGE_ABS)/driver/Module.symvers
......
-include Makefile.specific -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 -include $(REPO_PARENT)/parent_common.mk
TOP_DIR ?= $(shell pwd)/../.. TOP_DIR ?= $(shell pwd)/../..
...@@ -10,8 +7,6 @@ HDL_DIR ?= $(TOP_DIR)/hdl ...@@ -10,8 +7,6 @@ HDL_DIR ?= $(TOP_DIR)/hdl
KVERSION ?= $(shell uname -r) KVERSION ?= $(shell uname -r)
LINUX ?= /lib/modules/$(KVERSION)/build LINUX ?= /lib/modules/$(KVERSION)/build
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS ?= $(abspath $(CONFIG_FPGA_MGR_BACKPORT_PATH))
VMEBRIDGE_ABS ?= $(abspath $(VMEBRIDGE)) VMEBRIDGE_ABS ?= $(abspath $(VMEBRIDGE))
FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR)) FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR))
FMC_ABS ?= $(abspath $(FMC)) FMC_ABS ?= $(abspath $(FMC))
...@@ -37,7 +32,7 @@ modules help coccicheck modules_install: svec-core-fpga.h ...@@ -37,7 +32,7 @@ modules help coccicheck modules_install: svec-core-fpga.h
$(MAKE) -C $(LINUX) M=$(shell pwd) \ $(MAKE) -C $(LINUX) M=$(shell pwd) \
VERSION=$(VERSION) \ VERSION=$(VERSION) \
VMEBRIDGE_ABS=$(VMEBRIDGE_ABS) \ 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) \ CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) \
FMC_ABS=$(FMC_ABS) \ FMC_ABS=$(FMC_ABS) \
I2C_ABS=$(I2C_ABS) \ I2C_ABS=$(I2C_ABS) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment