software: Kernel: fpga-mgr-backport to be used only for old kernel

1- Header-files and Module.symvers from fpga-mgr-backport project should only be used for the FEC-OS based on 3.10.0-957.1.3.rt56.913.el7.x86_64 CentOS kernel. 2- Module.symvers from fmc-sw project were included twice. Thus giving warning for duplication. Signed-off-by: Vaibhav Gupta <vaibhav.gupta@cern.ch>

software: Kernel: fpga-mgr-backport to be used only for old kernel
1- Header-files and Module.symvers from fpga-mgr-backport project should only be used for the FEC-OS based on 3.10.0-957.1.3.rt56.913.el7.x86_64 CentOS kernel. 2- Module.symvers from fmc-sw project were included twice. Thus giving warning for duplication. Signed-off-by: Vaibhav Gupta <vaibhav.gupta@cern.ch>
161f222a · Vaibhav Gupta · Federico Vaga · d3a0b0f1 · 161f222a · 161f222a
Commit 161f222a authored Aug 12, 2022 by Vaibhav Gupta Committed by Federico Vaga Nov 09, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

Kbuild software/kernel/Kbuild +3 -4

Makefile software/kernel/Makefile +2 -0

No files found.
--- a/software/kernel/Kbuild
+++ b/software/kernel/Kbuild
@@ -18,11 +18,11 @@ SVEC_VERSION_BLD := $(shell printf "0x%02x%02x0000" $(VER_MAJ) $(VER_MIN))
 ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
 ccflags-y += -DVERSION=\"$(VERSION)\"
 ccflags-y += -DSVEC_VERSION_BLD=$(SVEC_VERSION_BLD)
+ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT
 ccflags-y += -Wall -Werror

+ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -I$(FPGA_MGR_ABS)/include
 ccflags-y += -I$(VMEBRIDGE_ABS)/include
-ccflags-y += -I$(FPGA_MGR_ABS)/include
-ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT
 ccflags-y += -I$(FMC_ABS)/include
 ccflags-y += -I$(I2C_ABS)/include
 ccflags-y += -I$(SPI_ABS)/include
@@ -37,9 +37,8 @@ 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
-KBUILD_EXTRA_SYMBOLS += $(FPGA_MGR_ABS)/drivers/fpga/Module.symvers
 KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers
 KBUILD_EXTRA_SYMBOLS += $(I2C_ABS)/drivers/i2c/busses/Module.symvers


--- a/software/kernel/Makefile
+++ b/software/kernel/Makefile
@@ -21,6 +21,8 @@ VERSION = $(shell git describe --dirty --long --tags)

 CHEBY ?= cheby

+CONFIG_FPGA_MGR_BACKPORT ?= n
+
 all: modules

 .PHONY: all modules clean help install modules_install coccicheck svec-core-fpga.h