Skip to content

S
Simple PCIe FMC carrier SPEC
Commit 7c123155 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

better integration in coht building system 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 8ccd8be5
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 15 deletions
software/Makefile
View file @ 7c123155
-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
......
software/kernel/Kbuild
View file @ 7c123155
...@@ -7,15 +7,12 @@ endif ...@@ -7,15 +7,12 @@ 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)"
ccflags-y += -DVERSION=\"$(VERSION)\" ccflags-y += -DVERSION=\"$(VERSION)\"
ccflags-y += -Wall -Werror ccflags-y += -Wall -Werror
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$(SPI_ABS)/include ccflags-y += -I$(SPI_ABS)/include
...@@ -23,8 +20,10 @@ ccflags-y += -I$(SPI_ABS)/include ...@@ -23,8 +20,10 @@ ccflags-y += -I$(SPI_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
......
software/kernel/Makefile
View file @ 7c123155
-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
KVERSION ?= $(shell uname -r) KVERSION ?= $(shell uname -r)
...@@ -32,7 +29,7 @@ I2C ?= $(DKMSTREE)/i2c-ocores/$(I2C_VERSION)/source ...@@ -32,7 +29,7 @@ I2C ?= $(DKMSTREE)/i2c-ocores/$(I2C_VERSION)/source
SPI ?= $(DKMSTREE)/spi-ocores/$(SPI_VERSION)/source SPI ?= $(DKMSTREE)/spi-ocores/$(SPI_VERSION)/source
endif endif
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS ?= $(abspath $(CONFIG_FPGA_MGR_BACKPORT_PATH)) FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR))
FMC_ABS ?= $(abspath $(FMC)) FMC_ABS ?= $(abspath $(FMC))
I2C_ABS ?= $(abspath $(I2C)) I2C_ABS ?= $(abspath $(I2C))
SPI_ABS ?= $(abspath $(SPI)) SPI_ABS ?= $(abspath $(SPI))
...@@ -60,7 +57,7 @@ clean: clean-spec-core-fpga.h ...@@ -60,7 +57,7 @@ clean: clean-spec-core-fpga.h
modules help coccicheck modules_install clean: spec-core-fpga.h modules help coccicheck modules_install clean: spec-core-fpga.h
$(MAKE) -C $(LINUX) M=$(shell pwd) \ $(MAKE) -C $(LINUX) M=$(shell pwd) \
VERSION=$(VERSION) \ VERSION=$(VERSION) \
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