Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 1a18f7be authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

remove s[pv]ec-sw - they are not a dependency 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent b76df694
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 48 deletions
.gitmodules
View file @ 1a18f7be
......@@ -4,9 +4,3 @@
[submodule "fmc-bus"]
path = fmc-bus
url = git://ohwr.org/fmc-projects/fmc-bus.git
[submodule "spec-sw"]
path = spec-sw
url = git://ohwr.org/fmc-projects/spec/spec-sw.git
[submodule "svec-sw"]
path = svec-sw
url = git://ohwr.org/fmc-projects/svec/svec-sw.git
Makefile
View file @ 1a18f7be
......@@ -8,30 +8,21 @@ all: kernel tools lib libtools
FMC_BUS ?= fmc-bus
ZIO ?= zio
SPEC_SW ?= spec-sw
SVEC_SW ?= svec-sw
# Use the absolute path so it can be used by submodule
# FMC_BUS_ABS, ZIO_ABS, SPEC_SW_ABS and SVEC_SW_ABS has to be absolut path,
# FMC_BUS_ABS and ZIO_ABS has to be absolut path,
# due to beeing passed to the Kbuild
FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
ZIO_ABS ?= $(abspath $(ZIO) )
SPEC_SW_ABS ?= $(abspath $(SPEC_SW) )
SVEC_SW_ABS ?= $(abspath $(SVEC_SW) )
export FMC_BUS_ABS
export ZIO_ABS
export SPEC_SW_ABS
export SVEC_SW_ABS
DIRS = $(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS) kernel tools lib libtools
DIRS = $(FMC_BUS_ABS) $(ZIO_ABS) kernel tools lib libtools
$(SPEC_SW_ABS): $(FMC_BUS_ABS)
kernel: $(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS)
kernel: $(FMC_BUS_ABS) $(ZIO_ABS)
lib: $(ZIO_ABS)
tools libtools: lib
# we take only headers from svec-sw, no need to compile
kernel: svec-sw-init_repo
.PHONY: all clean modules install modules_install $(DIRS)
.PHONY: gitmodules prereq_install prereq_install_warn
......@@ -50,7 +41,7 @@ $(DIRS):
$(MAKE) -C $@ $(TARGET)
SUBMOD = $(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS)
SUBMOD = $(FMC_BUS_ABS) $(ZIO_ABS)
prereq_install_warn:
@test -f .prereq_installed || \
......@@ -62,7 +53,6 @@ prereq_install:
$(FMC_BUS_ABS): fmc-bus-init_repo
$(ZIO_ABS): zio-init_repo
$(SPEC_SW_ABS): spec-sw-init_repo
# init submodule if missing
fmc-bus-init_repo:
......@@ -71,11 +61,3 @@ 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) )
# init submodule if missing
spec-sw-init_repo:
@test -d $(SPEC_SW_ABS)/doc || ( echo "Checking out submodule $(SPEC_SW_ABS)" && git submodule update --init $(SPEC_SW_ABS) )
# init submodule if missing
svec-sw-init_repo:
@test -d $(SVEC_SW_ABS)/doc || ( echo "Checking out submodule $(SVEC_SW_ABS)" && git submodule update --init $(SVEC_SW_ABS) )
kernel/Kbuild
View file @ 1a18f7be
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 \
$(FMC_BUS_ABS)/kernel/Module.symvers \
$(SVEC_SW_EXTRA_SYMBOLS-y)
$(FMC_BUS_ABS)/kernel/Module.symvers
# add versions of supermodule. It is useful when fine-delay-sw is included as sub-module
# of a bigger project that we want to track
......@@ -16,8 +14,6 @@ endif
# add versions of used submodules
SUBMODULE_VERSIONS-y += MODULE_INFO(version_fmc_bus,\"$(FMC_BUS_VERSION)\");
SUBMODULE_VERSIONS-y += MODULE_INFO(version_zio,\"$(ZIO_VERSION)\");
SUBMODULE_VERSIONS-y += MODULE_INFO(version_spec_sw,\"$(SPEC_SW_VERSION)\");
SUBMODULE_VERSIONS-$(CONFIG_FMC_ADC_SVEC) += MODULE_INFO(version_svec_sw,\"$(SVEC_SW_VERSION)\");
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS-y)"
......@@ -27,10 +23,8 @@ LINUXINCLUDE := -I$(FMC_BUS_ABS)/kernel/include $(LINUXINCLUDE)
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\" \
-I$(ZIO_ABS)/include \
-I$(SPEC_SW_ABS)/kernel \
-I$(src)
ccflags-$(CONFIG_FMC_ADC_SVEC) += -I$(SVEC_SW_ABS)/kernel
ccflags-$(CONFIG_FMC_ADC_DEBUG) += -DDEBUG
ccflags-$(CONFIG_FMC_ADC_SVEC) += -DCONFIG_FMC_ADC_SVEC
......
kernel/Makefile
View file @ 1a18f7be
......@@ -7,33 +7,24 @@ REPO_PARENT ?= $(CURDIR)/../..
LINUX ?= /lib/modules/$(shell uname -r)/build
FMC_BUS ?= ../fmc-bus
ZIO ?= ../zio
SPEC_SW ?= ../spec-sw
SVEC_SW ?= ../svec-sw
# FMC_BUS_ABS, ZIO_ABS, SPEC_SW_ABS and SVEC_SW_ABS has to be absolut path,
# FMC_BUS_ABS and ZIO_ABS has to be absolut path,
# due to beeing passed to the Kbuild
FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
ZIO_ABS ?= $(abspath $(ZIO) )
SPEC_SW_ABS ?= $(abspath $(SPEC_SW) )
SVEC_SW_ABS ?= $(abspath $(SVEC_SW) )
GIT_VERSION = $(shell git describe --always --dirty --long --tags)
export GIT_VERSION
FMC_BUS_VERSION ?= $(shell cd $(FMC_BUS_ABS); git describe --always --dirty --long --tags)
ZIO_VERSION ?= $(shell cd $(ZIO_ABS); git describe --always --dirty --long --tags)
SPEC_SW_VERSION ?= $(shell cd $(SPEC_SW_ABS); git describe --always --dirty --long --tags)
SVEC_SW_VERSION ?= $(shell cd $(SVEC_SW_ABS); git describe --always --dirty --long --tags)
export FMC_BUS_VERSION
export ZIO_VERSION
export SPEC_SW_VERSION
export SVEC_SW_VERSION
all modules:
$(MAKE) -C $(LINUX) M=$(CURDIR) FMC_BUS_ABS=$(FMC_BUS_ABS) \
ZIO_ABS=$(ZIO_ABS) SPEC_SW_ABS=$(SPEC_SW_ABS) \
SVEC_SW_ABS=$(SVEC_SW_ABS) modules
ZIO_ABS=$(ZIO_ABS) modules
install modules_install: modules
$(MAKE) -C $(LINUX) M=$(CURDIR) modules_install
......
spec-sw @ 5f15d26e
Subproject commit 5f15d26e0e90a0e22f520a7185a940003bac799c
svec-sw @ 33c6880c
Subproject commit 33c6880c5056527d2d54fcf67be42fa5a2877426
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