Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC Bus
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
FMC Bus
Commits
b49474ce
Commit
b49474ce
authored
Nov 09, 2015
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'adam-coht'
Changes in the buildsystem.
parents
74a29b07
1f04c547
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
82 additions
and
43 deletions
+82
-43
Makefile
Makefile
+12
-5
Kbuild
kernel/Kbuild
+33
-0
Makefile
kernel/Makefile
+6
-32
fmc-chardev.c
kernel/fmc-chardev.c
+1
-1
fmc-core.c
kernel/fmc-core.c
+1
-1
fmc-fakedev.c
kernel/fmc-fakedev.c
+1
-1
fmc-trivial.c
kernel/fmc-trivial.c
+1
-1
fmc-write-eeprom.c
kernel/fmc-write-eeprom.c
+1
-1
Makefile
tools/Makefile
+5
-0
Makefile
tools/libipmi/Makefile
+6
-1
ipmi.c
tools/libipmi/ipmi.c
+15
-0
No files found.
Makefile
View file @
b49474ce
DIRS
=
kernel tools
all modules install modules_install
:
for
d
in
$(DIRS)
;
do
$(MAKE)
-C
$$
d
$@
||
exit
1
;
done
.PHONY
:
all clean modules install modules_install $(DIRS) sdb-lib
all clean modules install modules_install
:
$(DIRS)
# additionally clean sdb-lib
clean
:
sdb-lib
clean
:
TARGET = clean
modules
:
TARGET = modules
install
:
TARGET = install
modules_install
:
TARGET = modules_install
clean
:
for
d
in
$(DIRS)
sdb-lib
;
do
$(MAKE)
-C
$$
d
$@
||
exit
1
;
done
$(DIRS) sdb-lib
:
$(MAKE)
-C
$@
$(TARGET)
kernel/Kbuild
0 → 100644
View file @
b49474ce
ccflags-y += -I$(src)/include
obj-m = fmc.o
obj-m += fmc-fakedev.o
obj-m += fmc-trivial.o
obj-m += fmc-write-eeprom.o
obj-m += fmc-chardev.o
fmc-y = fmc-core.o
fmc-y += fmc-match.o
fmc-y += fmc-sdb.o
fmc-y += fru-parse.o
fmc-y += fmc-dump.o
fmc-y += fmc-debug.o
# 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
LINUXINCLUDE := -I$(src)/include -I$(src)/include/linux $(LINUXINCLUDE)
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
fmc-y += ../sdb-lib/access.o
fmc-y += ../sdb-lib/glue.o
kernel/Makefile
View file @
b49474ce
# 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
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
ccflags-y
+=
-I
$(src)
/include
obj-m
=
fmc.o
obj-m
+=
fmc-fakedev.o
obj-m
+=
fmc-trivial.o
obj-m
+=
fmc-write-eeprom.o
obj-m
+=
fmc-chardev.o
fmc-y
=
fmc-core.o
fmc-y
+=
fmc-match.o
fmc-y
+=
fmc-sdb.o
fmc-y
+=
fru-parse.o
fmc-y
+=
fmc-dump.o
fmc-y
+=
fmc-debug.o
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
$(src)
/include
-I
$(src)
/include/linux
$(LINUXINCLUDE)
ccflags-y
+=
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
GIT_VERSION
=
$(
shell
git describe
--dirty
--long
--tags
)
fmc-y
+=
../sdb-lib/access.o
fmc-y
+=
../sdb-lib/glue.o
export
GIT_VERSION
all modules
:
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
/bin/pwd
)
modules
...
...
kernel/fmc-chardev.c
View file @
b49474ce
...
...
@@ -201,4 +201,4 @@ module_exit(fc_exit);
MODULE_VERSION
(
GIT_VERSION
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
kernel/fmc-core.c
View file @
b49474ce
...
...
@@ -389,4 +389,4 @@ module_exit(fmc_exit);
MODULE_VERSION
(
GIT_VERSION
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
kernel/fmc-fakedev.c
View file @
b49474ce
...
...
@@ -349,4 +349,4 @@ module_exit(ff_exit);
MODULE_VERSION
(
GIT_VERSION
);
MODULE_LICENSE
(
"GPL and additional rights"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
kernel/fmc-trivial.c
View file @
b49474ce
...
...
@@ -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
;
kernel/fmc-write-eeprom.c
View file @
b49474ce
...
...
@@ -176,4 +176,4 @@ module_exit(fwe_exit);
MODULE_VERSION
(
GIT_VERSION
);
MODULE_LICENSE
(
"GPL"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
tools/Makefile
View file @
b49474ce
...
...
@@ -3,6 +3,11 @@
# build a particular environment.
-include
Makefile.specific
# 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
CFLAGS
=
-Wall
-ggdb
-O2
-I
../kernel/include
$(EXTRACFLAGS)
PROGS
=
fru-dump fmc-mem
...
...
tools/libipmi/Makefile
View file @
b49474ce
...
...
@@ -3,6 +3,11 @@
# build a particular environment.
-include
Makefile.specific
# 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
OBJ
=
ipmi.o
OUT
=
libipmi.a
OUT_SO
=
libipmi.so
...
...
@@ -12,7 +17,7 @@ CFLAGS+=-fPIC -shared -Wall -Wextra -ggdb $(EXTRACFLAGS)
all
:
$(OUT) $(OUT_SO)
$(OUT)
:
$(OBJ)
ar
rcs
$(OUT)
$(OBJ)
$(AR)
rcs
$(OUT)
$(OBJ)
$(OUT_SO)
:
$(OBJ)
$(CC)
$<
$(CFLAGS)
-shared
-fPIC
-L
.
-Wl
,-soname,
$@
-o
$@
...
...
tools/libipmi/ipmi.c
View file @
b49474ce
...
...
@@ -73,6 +73,9 @@ int ipmi_common_header_write(void)
ch
->
checksum
=
checksum
((
uint8_t
*
)
ch
,
sizeof
(
struct
common_header
)
-
1
);
ret
=
fwrite
(
ch
,
1
,
sizeof
(
struct
common_header
),
f
);
/* avoid warning, maybe ret will be used one day */
(
void
)
ret
;
return
0
;
}
...
...
@@ -190,6 +193,9 @@ int ipmi_board_info_area_write(void)
ret
=
fwrite
(
&
nul
,
1
,
sizeof
(
uint8_t
),
f
);
ret
=
fwrite
(
&
bia
->
checksum
,
1
,
sizeof
(
uint8_t
),
f
);
/* avoid warning, maybe ret will be used one day */
(
void
)
ret
;
return
0
;
}
...
...
@@ -220,6 +226,9 @@ int ipmi_dc_load_record_write(int end)
t
=
t
->
next
;
}
/* avoid warning, maybe ret will be used one day */
(
void
)
ret
;
return
0
;
}
...
...
@@ -250,6 +259,9 @@ int ipmi_dc_output_record_write(int end)
t
=
t
->
next
;
}
/* avoid warning, maybe ret will be used one day */
(
void
)
ret
;
return
0
;
}
...
...
@@ -279,6 +291,9 @@ int ipmi_oem_record_write(int end)
ret
=
fwrite
(
&
head
,
1
,
sizeof
(
struct
multirecord_header
),
f
);
ret
=
fwrite
(
oem
,
1
,
sizeof
(
struct
oem_record
),
f
);
/* avoid warning, maybe ret will be used one day */
(
void
)
ret
;
return
0
;
}
...
...
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