Commit ceed5ebd authored by Dimitris Lampridis's avatar Dimitris Lampridis

kernel: [fix] [backport] update submodules to allow the FMC-ADC v4.1 software to…

kernel: [fix] [backport] update submodules to allow the FMC-ADC v4.1 software to work with newer kernels.

Tested with kernels 4.15, 4.19, 5.0 and 5.2.

NOTE: the WR NIC from the spec-sw is still not up-to-date. It is important to compile
the FMC-ADC software with 'CONFIG_WR_NIC=n make' to prevent the NIC from being compiled.
parent b421b551
[submodule "zio"]
path = zio
url = git://ohwr.org/misc/zio.git
url = https://ohwr.org/project/zio.git
[submodule "fmc-bus"]
path = fmc-bus
url = git://ohwr.org/fmc-projects/fmc-bus.git
url = https://ohwr.org/project/fmc-bus.git
[submodule "spec-sw"]
path = spec-sw
url = git://ohwr.org/fmc-projects/spec/spec-sw.git
url = https://ohwr.org/project/spec-sw.git
[submodule "svec-sw"]
path = svec-sw
url = git://ohwr.org/fmc-projects/svec/svec-sw.git
url = https://ohwr.org/project/svec-sw.git
......@@ -70,7 +70,7 @@ fmc-bus-init_repo:
# init submodule if missing
zio-init_repo:
@test -d $(ZIO_ABS)/doc || ( echo "Checking out submodule $(ZIO_ABS)" && git submodule update --init $(ZIO_ABS) )
@test -d $(ZIO_ABS)/Documentation || ( echo "Checking out submodule $(ZIO_ABS)" && git submodule update --init $(ZIO_ABS) )
# init submodule if missing
spec-sw-init_repo:
......
......@@ -2,7 +2,7 @@ CONFIG_FMC_ADC_SVEC ?= CONFIG_VME
SVEC_SW_EXTRA_SYMBOLS-$(CONFIG_FMC_ADC_SVEC) := $(SVEC_SW_ABS)/kernel/Module.symvers.vmebus
KBUILD_EXTRA_SYMBOLS := \
$(ZIO_ABS)/Module.symvers \
$(ZIO_ABS)/drivers/zio/Module.symvers \
$(FMC_BUS_ABS)/kernel/Module.symvers \
$(SVEC_SW_EXTRA_SYMBOLS-y)
......@@ -35,8 +35,8 @@ ccflags-$(CONFIG_FMC_ADC_DEBUG) += -DDEBUG
ccflags-$(CONFIG_FMC_ADC_SVEC) += -DCONFIG_FMC_ADC_SVEC
# Extract ZIO minimum compatible version
ccflags-y += -D__ZIO_MIN_MAJOR_VERSION=$(shell echo $(ZIO_VERSION) | cut -d '-' -f 2 | cut -d '.' -f 1; )
ccflags-y += -D__ZIO_MIN_MINOR_VERSION=$(shell echo $(ZIO_VERSION) | cut -d '-' -f 2 | cut -d '.' -f 2; )
ccflags-y += -D__ZIO_MIN_MAJOR_VERSION=$(shell echo $(ZIO_VERSION) | grep -o -E "[^v]*" | cut -d '-' -f 1 | cut -d '.' -f 1; )
ccflags-y += -D__ZIO_MIN_MINOR_VERSION=$(shell echo $(ZIO_VERSION) | grep -o -E "[^v]*" | cut -d '-' -f 1 | cut -d '.' -f 2; )
subdirs-ccflags-y = $(ccflags-y)
......
Subproject commit 08b08c1b725921cf0ba7551b45313d3ad2bec8c0
Subproject commit 36f70fe4b32259d95cf8aab8dbf4a462f3ceba78
Subproject commit 0aea6955d010ac9f4e5983cad36bdfa438b63888
Subproject commit 14f5bc889dcbfb2daaeeb8869970758ab49c4f86
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