Skip to content

F
FMC Bus
Commit b49474ce authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

Merge branch 'adam-coht' 

Changes in the buildsystem.
parents 74a29b07 1f04c547
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 43 deletions
Makefile
View file @ b49474ce
DIRS = kernel tools DIRS = kernel tools
all modules install modules_install: .PHONY: all clean modules install modules_install $(DIRS) sdb-lib
for d in $(DIRS); do $(MAKE) -C $$d $@ || exit 1; done
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: $(DIRS) sdb-lib:
for d in $(DIRS) sdb-lib; do $(MAKE) -C $$d $@ || exit 1; done $(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 LINUX ?= /lib/modules/$(shell uname -r)/build
ccflags-y += -I$(src)/include GIT_VERSION = $(shell git describe --dirty --long --tags)
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)\"
fmc-y += ../sdb-lib/access.o export GIT_VERSION
fmc-y += ../sdb-lib/glue.o
all modules: all modules:
$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules $(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules
......
kernel/fmc-chardev.c
View file @ b49474ce
...@@ -201,4 +201,4 @@ module_exit(fc_exit); ...@@ -201,4 +201,4 @@ module_exit(fc_exit);
MODULE_VERSION(GIT_VERSION); MODULE_VERSION(GIT_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
CERN_SUPER_MODULE; ADDITIONAL_VERSIONS;
kernel/fmc-core.c
View file @ b49474ce
...@@ -389,4 +389,4 @@ module_exit(fmc_exit); ...@@ -389,4 +389,4 @@ module_exit(fmc_exit);
MODULE_VERSION(GIT_VERSION); MODULE_VERSION(GIT_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
CERN_SUPER_MODULE; ADDITIONAL_VERSIONS;
kernel/fmc-fakedev.c
View file @ b49474ce
...@@ -349,4 +349,4 @@ module_exit(ff_exit); ...@@ -349,4 +349,4 @@ module_exit(ff_exit);
MODULE_VERSION(GIT_VERSION); MODULE_VERSION(GIT_VERSION);
MODULE_LICENSE("GPL and additional rights"); 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); ...@@ -97,4 +97,4 @@ module_exit(t_exit);
MODULE_VERSION(GIT_VERSION); MODULE_VERSION(GIT_VERSION);
MODULE_LICENSE("GPL and additional rights"); /* public domain */ 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); ...@@ -176,4 +176,4 @@ module_exit(fwe_exit);
MODULE_VERSION(GIT_VERSION); MODULE_VERSION(GIT_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
CERN_SUPER_MODULE; ADDITIONAL_VERSIONS;
tools/Makefile
View file @ b49474ce
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
# build a particular environment. # build a particular environment.
-include Makefile.specific -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) CFLAGS = -Wall -ggdb -O2 -I../kernel/include $(EXTRACFLAGS)
PROGS = fru-dump fmc-mem PROGS = fru-dump fmc-mem
......
tools/libipmi/Makefile
View file @ b49474ce
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
# build a particular environment. # build a particular environment.
-include Makefile.specific -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 OBJ=ipmi.o
OUT=libipmi.a OUT=libipmi.a
OUT_SO=libipmi.so OUT_SO=libipmi.so
...@@ -12,7 +17,7 @@ CFLAGS+=-fPIC -shared -Wall -Wextra -ggdb $(EXTRACFLAGS) ...@@ -12,7 +17,7 @@ CFLAGS+=-fPIC -shared -Wall -Wextra -ggdb $(EXTRACFLAGS)
all: $(OUT) $(OUT_SO) all: $(OUT) $(OUT_SO)
$(OUT): $(OBJ) $(OUT): $(OBJ)
ar rcs $(OUT) $(OBJ) $(AR) rcs $(OUT) $(OBJ)
$(OUT_SO): $(OBJ) $(OUT_SO): $(OBJ)
$(CC) $< $(CFLAGS) -shared -fPIC -L. -Wl,-soname,$@ -o $@ $(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) ...@@ -73,6 +73,9 @@ int ipmi_common_header_write(void)
ch->checksum = checksum((uint8_t *)ch, sizeof(struct common_header) - 1); ch->checksum = checksum((uint8_t *)ch, sizeof(struct common_header) - 1);
ret = fwrite(ch, 1, sizeof(struct common_header), f); ret = fwrite(ch, 1, sizeof(struct common_header), f);
/* avoid warning, maybe ret will be used one day */
(void) ret;
return 0; return 0;
} }
...@@ -190,6 +193,9 @@ int ipmi_board_info_area_write(void) ...@@ -190,6 +193,9 @@ int ipmi_board_info_area_write(void)
ret = fwrite(&nul, 1, sizeof(uint8_t), f); ret = fwrite(&nul, 1, sizeof(uint8_t), f);
ret = fwrite(&bia->checksum, 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; return 0;
} }
...@@ -220,6 +226,9 @@ int ipmi_dc_load_record_write(int end) ...@@ -220,6 +226,9 @@ int ipmi_dc_load_record_write(int end)
t = t->next; t = t->next;
} }
/* avoid warning, maybe ret will be used one day */
(void) ret;
return 0; return 0;
} }
...@@ -250,6 +259,9 @@ int ipmi_dc_output_record_write(int end) ...@@ -250,6 +259,9 @@ int ipmi_dc_output_record_write(int end)
t = t->next; t = t->next;
} }
/* avoid warning, maybe ret will be used one day */
(void) ret;
return 0; return 0;
} }
...@@ -279,6 +291,9 @@ int ipmi_oem_record_write(int end) ...@@ -279,6 +291,9 @@ int ipmi_oem_record_write(int end)
ret = fwrite(&head, 1, sizeof(struct multirecord_header), f); ret = fwrite(&head, 1, sizeof(struct multirecord_header), f);
ret = fwrite(oem, 1, sizeof(struct oem_record), f); ret = fwrite(oem, 1, sizeof(struct oem_record), f);
/* avoid warning, maybe ret will be used one day */
(void) ret;
return 0; return 0;
} }
......
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