Merge branch 'adam-coht'

Changes in the buildsystem.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Makefile

+# 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
+
 # by default use the fmc-bus within the repository
-FMC_BUS ?= $(shell pwd)/fmc-bus/
-export FMC_BUS
-FMC_DRV ?= $(FMC_BUS)/kernel/
-export FMC_DRV
+FMC_BUS ?= fmc-bus
+# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
+FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
+export FMC_BUS_ABS
+
+DIRS = $(FMC_BUS_ABS) kernel tools
+
+.PHONY: all clean modules install modules_install $(DIRS)
+
+all clean modules install modules_install: $(DIRS)
+
+clean: TARGET = clean
+modules: TARGET = modules
+install: TARGET = install
+modules_install: TARGET = modules_install
+
+$(DIRS):
+	$(MAKE) -C $@ $(TARGET)
 
-RUNME := $(shell test -d $(FMC_DRV) || git submodule update --init)
+$(FMC_BUS_ABS): fmc-bus-init_repo
 
-DIRS = $(FMC_BUS) kernel tools
+# init submodule if missing
+fmc-bus-init_repo:
+	@test -d $(FMC_BUS_ABS)/doc || ( echo "Checking out submodule $(FMC_BUS_ABS)"; git submodule update --init $(FMC_BUS_ABS) )
 
-all clean modules install modules_install:
-	for d in $(DIRS); do $(MAKE) -C $$d $@ || exit 1; done
+kernel: $(FMC_BUS_ABS)

kernel/Kbuild

+KBUILD_EXTRA_SYMBOLS := $(FMC_BUS_ABS)/kernel/Module.symvers
+
+# add versions of supermodule. It is useful when spec-sw is included as sub-module
+# of a bigger project that we want to track
+ifdef CONFIG_SUPER_REPO
+ifdef CONFIG_SUPER_REPO_VERSION
+SUBMODULE_VERSIONS += MODULE_INFO(version_$(CONFIG_SUPER_REPO),\"$(CONFIG_SUPER_REPO_VERSION)\");
+endif
+endif
+# add versions of used submodules
+SUBMODULE_VERSIONS += MODULE_INFO(version_fmc_bus,\"$(FMC_BUS_VERSION)\");
+
+ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
+
+# The library includes <sdb.h>, so point -I directtly there
+# include our header before to avoid conflicts with the kernel
+LINUXINCLUDE :=  -I$(FMC_BUS_ABS)/kernel/include -I$(src)/include/linux $(LINUXINCLUDE)
+ccflags-y += -I$(src)/include
+ccflags-y += $(WR_NIC_CFLAGS)
+ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
+
+
+# this is a bad hack. Sometimes we are a submodule, and wr-nic can
+# only compile with recent versions, so let the caller disable it
+# FIXME: this is incorrect if we get copied to the kernel proper.
+CONFIG_WR_NIC ?= m
+
+obj-m += spec.o
+obj-$(CONFIG_WR_NIC) += wr-nic.o
+
+spec-y = spec-pci.o
+spec-y += spec-fmc.o
+spec-y += spec-i2c.o
+spec-y += spec-vic.o
+spec-y += loader-ll.o
+spec-y += spec-gpio-no.o
+spec-$(CONFIG_GPIOLIB) += spec-gpio.o
+
+wr-nic-y = wr-nic-core.o
+wr-nic-y += wr-nic-eth.o
+wr-nic-y += wr-nic-dio.o
+wr-nic-y += wr_nic/device.o
+wr-nic-y += wr_nic/endpoint.o
+wr-nic-y += wr_nic/ethtool.o
+wr-nic-y += wr_nic/nic-core.o
+wr-nic-y += wr_nic/timestamp.o
+wr-nic-y += wr_nic/pps.o
+wr-nic-$(CONFIG_GPIOLIB) += wr-nic-gpio.o

kernel/Makefile

+# 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
+
 LINUX ?= /lib/modules/$(shell uname -r)/build
 
 # by default use the fmc-bus within the repository
-FMC_BUS ?= $(shell pwd)/../fmc-bus/
-FMC_DRV ?= $(FMC_BUS)/kernel/
-
-KBUILD_EXTRA_SYMBOLS := $(FMC_DRV)/Module.symvers
-
-GIT_VERSION = $(shell cd $(src); git describe --dirty --long --tags)
-
-# For this CSM_VERSION, please see ohwr.org/csm documentation
-ifdef CONFIG_CSM_VERSION
-  ccflags-y += -D"CERN_SUPER_MODULE=MODULE_VERSION(\"$(CONFIG_CSM_VERSION)\")"
-else
-  ccflags-y += -DCERN_SUPER_MODULE=""
-endif
-
-# The library includes <sdb.h>, so point -I directtly there
-# include our header before to avoid conflicts with the kernel
-LINUXINCLUDE :=  -I$(FMC_DRV)/include -I$(src)/include/linux $(LINUXINCLUDE)
-ccflags-y += -I$(src)/include
-ccflags-y += $(WR_NIC_CFLAGS)
-ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
-
-
-# this is a bad hack. Sometimes we are a submodule, and wr-nic can
-# only compile with recent versions, so let the caller disable it
-# FIXME: this is incorrect if we get copied to the kernel proper.
-CONFIG_WR_NIC ?= m
-
-obj-m += spec.o
-obj-$(CONFIG_WR_NIC) += wr-nic.o
-
-spec-y = spec-pci.o
-spec-y += spec-fmc.o
-spec-y += spec-i2c.o
-spec-y += spec-vic.o
-spec-y += loader-ll.o
-spec-y += spec-gpio-no.o
-spec-$(CONFIG_GPIOLIB) += spec-gpio.o
+FMC_BUS ?= ../fmc-bus/
+# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
+FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
 
-wr-nic-y = wr-nic-core.o
-wr-nic-y += wr-nic-eth.o
-wr-nic-y += wr-nic-dio.o
-wr-nic-y += wr_nic/device.o
-wr-nic-y += wr_nic/endpoint.o
-wr-nic-y += wr_nic/ethtool.o
-wr-nic-y += wr_nic/nic-core.o
-wr-nic-y += wr_nic/timestamp.o
-wr-nic-y += wr_nic/pps.o
-wr-nic-$(CONFIG_GPIOLIB) += wr-nic-gpio.o
+GIT_VERSION = $(shell git describe --dirty --long --tags)
+export GIT_VERSION
 
+FMC_BUS_VERSION ?= $(shell cd $(FMC_BUS_ABS); git describe --always --dirty --long --tags)
+export FMC_BUS_VERSION
 
 all modules:
-	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules
+	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) FMC_BUS_ABS=$(FMC_BUS_ABS) modules
 
 install modules_install:
 	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules_install
@@ -61,4 +26,4 @@ install modules_install:
 clean:
 	rm -rf *.o *~  .*.cmd *.ko *.mod.c .tmp_versions Module.symvers \
 		Module.markers modules.order
-	rm -rf wr_nic/*.o wr_nic/*~
+	rm -rf wr_nic/*.o wr_nic/*~ wr_nic/.*.o.cmd

kernel/spec-pci.c

@@ -314,4 +314,4 @@ module_exit(spec_exit);
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL");
 
-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;

kernel/wr-nic-core.c

@@ -226,4 +226,4 @@ void __weak wrn_gpio_exit(struct fmc_device *fmc)
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL");
 
-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;

tools/Makefile

@@ -3,8 +3,11 @@
 # build a particular environment.
 -include Makefile.specific
 
+# include parent_common.mk for buildsystem's defines
+REPO_PARENT=../..
+-include $(REPO_PARENT)/parent_common.mk
+
 CFLAGS += -ggdb -Wall -fPIC -I../kernel $(EXTRACFLAGS)
-LDFLAGS += -L. -lspec
 
 LIB = libspec.a
 LIBOBJ = speclib.o loader-ll.o
@@ -20,13 +23,13 @@ all: $(LIB) $(PROGS) $(LIBSHARED)
 $(PROGS): $(LIB)
 
 $(LIB): $(LIBOBJ)
-	ar r $@ $^
+	$(AR) r $@ $^
 
 loader-ll.o:	../kernel/loader-ll.c
 		${CC} $(CFLAGS) -c $^ -I .
 
 $(LIBSHARED): $(LIB)
-	${CC} -shared -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive
+	$(CC) -shared -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive
 
 
 clean: