kernel: change the code of including CERN_SUPER_MODULE

Also change its name. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

kernel: change the code of including CERN_SUPER_MODULE
Also change its name. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
1f04c547 · Adam Wujek · 262a8a26 · 1f04c547 · 1f04c547 · 1f04c547
Commit 1f04c547 authored Oct 27, 2015 by Adam Wujek 💬
6 changed files
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -14,12 +14,15 @@ fmc-y += fru-parse.o
 fmc-y += fmc-dump.o
 fmc-y += fmc-debug.o

-# 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=""
+# add versions of supermodule. It is useful when fmc-bus 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
+
+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

--- a/kernel/fmc-chardev.c
+++ b/kernel/fmc-chardev.c
@@ -201,4 +201,4 @@ module_exit(fc_exit);
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL");

-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;
--- a/kernel/fmc-core.c
+++ b/kernel/fmc-core.c
@@ -389,4 +389,4 @@ module_exit(fmc_exit);
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL");

-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;
--- a/kernel/fmc-fakedev.c
+++ b/kernel/fmc-fakedev.c
@@ -349,4 +349,4 @@ module_exit(ff_exit);
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL and additional rights");

-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;
--- a/kernel/fmc-trivial.c
+++ b/kernel/fmc-trivial.c
@@ -97,4 +97,4 @@ module_exit(t_exit);
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL and additional rights"); /* public domain */

-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;
--- a/kernel/fmc-write-eeprom.c
+++ b/kernel/fmc-write-eeprom.c
@@ -176,4 +176,4 @@ module_exit(fwe_exit);
 MODULE_VERSION(GIT_VERSION);
 MODULE_LICENSE("GPL");

-CERN_SUPER_MODULE;
+ADDITIONAL_VERSIONS;