Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Z
ZIO
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
ZIO
Commits
d135576d
Commit
d135576d
authored
Nov 09, 2015
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'adam-coht'
Changes in the buildsystem.
parents
fd618751
e159bebb
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
75 additions
and
71 deletions
+75
-71
Kbuild
Kbuild
+32
-0
Makefile
Makefile
+9
-31
Makefile
buffers/Makefile
+7
-9
zio-buf-vmalloc.c
buffers/zio-buf-vmalloc.c
+1
-1
core.c
core.c
+1
-1
Makefile
drivers/Makefile
+7
-9
zio-ad788x.c
drivers/zio-ad788x.c
+1
-1
zio-fake-dtc.c
drivers/zio-fake-dtc.c
+1
-1
zio-gpio.c
drivers/zio-gpio.c
+1
-1
zio-irq-tdc.c
drivers/zio-irq-tdc.c
+1
-1
zio-loop.c
drivers/zio-loop.c
+1
-1
zio-mini.c
drivers/zio-mini.c
+1
-1
zio-vmk8055.c
drivers/zio-vmk8055.c
+1
-1
zio-zero.c
drivers/zio-zero.c
+1
-1
Makefile
triggers/Makefile
+7
-9
zio-trig-hrt.c
triggers/zio-trig-hrt.c
+1
-1
zio-trig-irq.c
triggers/zio-trig-irq.c
+1
-1
zio-trig-timer.c
triggers/zio-trig-timer.c
+1
-1
No files found.
Kbuild
0 → 100644
View file @
d135576d
zio-y := core.o chardev.o sysfs.o misc.o
zio-y += bus.o objects.o helpers.o dma.o
zio-y += buffers/zio-buf-kmalloc.o triggers/zio-trig-user.o
# Waiting for Kconfig...
CONFIG_ZIO_SNIFF_DEV:=y
zio-$(CONFIG_ZIO_SNIFF_DEV) += sniff-dev.o
obj-m = zio.o
obj-m += drivers/
obj-m += buffers/
obj-m += triggers/
# src is defined byt the kernel Makefile, but we want to use it also in our
# local Makefile (tools, lib)
# add versions of supermodule. It is useful when ZIO 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)"
# WARNING: the line below doesn't work in-kernel if you compile with O=
ccflags-y += -I$(src)/include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += $(ZIO_VERSION)
ccflags-$(CONFIG_ZIO_DEBUG) += -DDEBUG
Makefile
View file @
d135576d
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
zio-y
:=
core.o chardev.o sysfs.o misc.o
zio-y
+=
bus.o objects.o helpers.o dma.o
zio-y
+=
buffers/zio-buf-kmalloc.o triggers/zio-trig-user.o
# Waiting for Kconfig...
CONFIG_ZIO_SNIFF_DEV
:=
y
zio-$(CONFIG_ZIO_SNIFF_DEV)
+=
sniff-dev.o
obj-m
=
zio.o
obj-m
+=
drivers/
obj-m
+=
buffers/
obj-m
+=
triggers/
# include parent_common.mk for buildsystem's defines
# It allows you to inherit an environment configuration from larger project
REPO_PARENT
=
..
-include
$(REPO_PARENT)/parent_common.mk
# src is defined byt the kernel Makefile, but we want to use it also in our
# local Makefile (tools, lib)
src
?=
$(
shell
pwd
)
GIT_VERSION
:=
$(
shell
cd
$(src)
;
git describe
--dirty
--long
--tags
)
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
# 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
GIT_VERSION
:=
$(
shell
git describe
--dirty
--long
--tags
)
# Extract major, minor and patch number
ZIO_VERSION
:=
-D__ZIO_MAJOR_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
2 |
cut
-d
'.'
-f
1
;
)
ZIO_VERSION
+=
-D__ZIO_MINOR_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
2 |
cut
-d
'.'
-f
2
;
)
ZIO_VERSION
+=
-D__ZIO_PATCH_VERSION
=
$(
shell
echo
$(GIT_VERSION)
|
cut
-d
'-'
-f
3
)
export
ZIO_VERSION
# WARNING: the line below doesn't work in-kernel if you compile with O=
ccflags-y
+=
-I
$(src)
/include/
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
ccflags-y
+=
$(ZIO_VERSION)
ccflags-$(CONFIG_ZIO_DEBUG)
+=
-DDEBUG
export
GIT_VERSION
export
ZIO_VERSION
all
:
modules tools
...
...
@@ -60,5 +37,6 @@ tools:
clean
:
rm
-rf
`
find
.
-name
\*
.o
-o
-name
\*
.ko
-o
-name
\*
~
`
rm
-rf
`
find
.
-name
Module.
\*
-o
-name
\*
.mod.c
`
rm
-rf
`
find
.
-name
\*
.ko.cmd
-o
-name
\*
.o.cmd
`
rm
-rf
.tmp_versions modules.order
$(MAKE)
-C
tools clean
buffers/Makefile
View file @
d135576d
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
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
=
""
# add versions of supermodule
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)
"
ccflags-y
+=
-I
$(src)
/../include/
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
ccflags-$(CONFIG_ZIO_DEBUG)
+=
-DDEBUG
...
...
buffers/zio-buf-vmalloc.c
View file @
d135576d
...
...
@@ -514,4 +514,4 @@ MODULE_AUTHOR("Alessandro Rubini");
MODULE_VERSION
(
GIT_VERSION
);
/* Defined in local Makefile */
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
core.c
View file @
d135576d
...
...
@@ -182,4 +182,4 @@ MODULE_AUTHOR("Federico Vaga and Alessandro Rubini");
MODULE_DESCRIPTION
(
"ZIO - ZIO Input Output"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/Makefile
View file @
d135576d
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
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
=
""
# add versions of supermodule
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)
"
ccflags-y
+=
-I
$(src)
/../include/
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
ccflags-y
+=
$(ZIO_VERSION)
...
...
drivers/zio-ad788x.c
View file @
d135576d
...
...
@@ -431,4 +431,4 @@ MODULE_AUTHOR("Federico Vaga <federico.vaga@gmail.com>");
MODULE_DESCRIPTION
(
"AD788x driver for ZIO framework"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-fake-dtc.c
View file @
d135576d
...
...
@@ -163,4 +163,4 @@ module_exit(zdtc_exit);
MODULE_VERSION
(
GIT_VERSION
);
/* Defined in local Makefile */
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-gpio.c
View file @
d135576d
...
...
@@ -222,4 +222,4 @@ module_exit(zgp_exit);
MODULE_VERSION
(
GIT_VERSION
);
/* Defined in local Makefile */
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-irq-tdc.c
View file @
d135576d
...
...
@@ -255,4 +255,4 @@ module_exit(ztdc_exit);
MODULE_VERSION
(
GIT_VERSION
);
/* Defined in local Makefile */
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-loop.c
View file @
d135576d
...
...
@@ -524,4 +524,4 @@ MODULE_AUTHOR("Alessandro Rubini <rubini@.com>");
MODULE_DESCRIPTION
(
"A zio driver which loops back to zio or a chardev"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-mini.c
View file @
d135576d
...
...
@@ -145,4 +145,4 @@ module_exit(zmini_exit);
MODULE_VERSION
(
GIT_VERSION
);
/* Defined in local Makefile */
MODULE_LICENSE
(
"GPL and additional rights"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-vmk8055.c
View file @
d135576d
...
...
@@ -607,4 +607,4 @@ MODULE_VERSION(GIT_VERSION);
MODULE_DESCRIPTION
(
"A zio driver for Velleman USB board K8055"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
drivers/zio-zero.c
View file @
d135576d
...
...
@@ -259,4 +259,4 @@ MODULE_AUTHOR("Federico Vaga <federico.vaga@gmail.com>");
MODULE_DESCRIPTION
(
"A zio driver which fakes zero, random and sawtooth input"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
triggers/Makefile
View file @
d135576d
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
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
=
""
# add versions of supermodule
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)
"
ccflags-y
+=
-I
$(src)
/../include/
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
ccflags-$(CONFIG_ZIO_DEBUG)
+=
-DDEBUG
...
...
triggers/zio-trig-hrt.c
View file @
d135576d
...
...
@@ -299,4 +299,4 @@ MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR
(
"Alessandro Rubini"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
triggers/zio-trig-irq.c
View file @
d135576d
...
...
@@ -188,4 +188,4 @@ MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR
(
"Alessandro Rubini"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
triggers/zio-trig-timer.c
View file @
d135576d
...
...
@@ -232,4 +232,4 @@ MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR
(
"Alessandro Rubini"
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment