diff --git a/acdx/driver/Makefile b/acdx/driver/Makefile index f53039bba40a824e8996fa98e21fed247f604a71..6d70de71407d7583a2d047a44568d0cf1da4f70d 100644 --- a/acdx/driver/Makefile +++ b/acdx/driver/Makefile @@ -7,7 +7,7 @@ all: driver driver: modules modules: - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/common.mk b/common.mk index 726bf7ac17487b51836f9bdaeb7495f0e0866742..490e30bd6f0981229cbeb0c2ad12f421e0caba7f 100644 --- a/common.mk +++ b/common.mk @@ -21,6 +21,8 @@ GIT_VERSION = $(shell git describe --dirty --long --tags --always) KERNELSRC=/acc/sys/$(CPU)/usr/src/kernels/$(KVER) +CROSS_COMPILE=$(TOOLS) + # used to convert list separated with spaces into list separated with commas comma:= , empty:= diff --git a/ctc/Makefile b/ctc/Makefile index 3f10980c5e11fdab25f3040b86158e6cc39456da..f9556337907342d0efb3224ff4cdbbe8be2ac496 100644 --- a/ctc/Makefile +++ b/ctc/Makefile @@ -22,7 +22,7 @@ all: modules libs examples libs: $(MODLIBS) modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` CPU=$(CPU) GIT_VERSION=$(GIT_VERSION) 'DRIVER_NAME=$(DRIVER_NAME)' CROSS_COMPILE=$(TOOLS) modules; + $(MAKE) -C $(KERNELSRC) M=`pwd` CPU=$(CPU) GIT_VERSION=$(GIT_VERSION) 'DRIVER_NAME=$(DRIVER_NAME)' CROSS_COMPILE=$(CROSS_COMPILE) modules; $(MKDIR) -p $(CPU)/$(KVER) mv $(DRIVER_OBJ) $(CPU)/$(KVER) mv *.ko $(CPU)/$(KVER) diff --git a/ctr-2.0 b/ctr-2.0 index 943ec3beb7059338a8fac47f55e54aa3c0e0e52a..fc7094a59fb7b0a0021486c687e4e73f18139876 160000 --- a/ctr-2.0 +++ b/ctr-2.0 @@ -1 +1 @@ -Subproject commit 943ec3beb7059338a8fac47f55e54aa3c0e0e52a +Subproject commit fc7094a59fb7b0a0021486c687e4e73f18139876 diff --git a/cvora/Makefile b/cvora/Makefile index 35dcee61a150588f3dee74d3e3c3d783c565c6f7..c40fe9e9aefa28e8dad873e23cca7a35cfc9f7e7 100644 --- a/cvora/Makefile +++ b/cvora/Makefile @@ -8,7 +8,7 @@ DRIVER_OBJ=cvora.o cvora.mod.o modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules; + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules; $(MKDIR) -p $(CPU)/$(KVER) mv $(DRIVER_OBJ) $(CPU)/$(KVER) mv *.ko $(CPU)/$(KVER) diff --git a/cvorb/driver/Makefile b/cvorb/driver/Makefile index 8e7c45efe6a47a2686865f9c3f91c085d4ac1f0c..b87ee176e7ee091f0145bd81cd02966fe04c62f9 100644 --- a/cvorb/driver/Makefile +++ b/cvorb/driver/Makefile @@ -7,7 +7,7 @@ driver: modules # compile with V=1 to see compilation details modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/cvorg/driver/Makefile b/cvorg/driver/Makefile index 09970f8571c02026e1aa9351c8681d232fe7a7ce..b99cae6c4ae40ff5a0b2f69fa905d61168387c14 100644 --- a/cvorg/driver/Makefile +++ b/cvorg/driver/Makefile @@ -6,7 +6,7 @@ driver: modules modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/encore b/encore index 847ad16bf80acbe4b0317d151ddafc3acdfc83ef..3ba6c4867b122b16b858a3e3a65801ef15554175 160000 --- a/encore +++ b/encore @@ -1 +1 @@ -Subproject commit 847ad16bf80acbe4b0317d151ddafc3acdfc83ef +Subproject commit 3ba6c4867b122b16b858a3e3a65801ef15554175 diff --git a/fmc/parent_common.mk b/fmc/parent_common.mk index 96379bdc7cb95441462dcf187106b300f757c31d..07d89c0b010782a2a246ed9fdfd0c4f073ec7c08 100644 --- a/fmc/parent_common.mk +++ b/fmc/parent_common.mk @@ -12,7 +12,6 @@ include $(REPO_PARENT)/../common.mk $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@ LINUX=$(KERNELSRC) -CROSS_COMPILE=$(TOOLS) export LINUX export CC export LD diff --git a/icv196/driver/Makefile b/icv196/driver/Makefile index 0eccc2f1ed846efa1d075e573afa3eda619b6b1f..31fac69ac16f3ed72e9b13e529837aac51ed5c13 100644 --- a/icv196/driver/Makefile +++ b/icv196/driver/Makefile @@ -4,7 +4,7 @@ include ../../common.mk all: modules modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/ipack b/ipack index 5a87c01258b43ded533a458c682c3a218dade6c0..d2bb3073d461afa036e39adc3d8f27c650cf9cce 160000 --- a/ipack +++ b/ipack @@ -1 +1 @@ -Subproject commit 5a87c01258b43ded533a458c682c3a218dade6c0 +Subproject commit d2bb3073d461afa036e39adc3d8f27c650cf9cce diff --git a/mil1553 b/mil1553 index 8f0db2e2b80f77490ef98e64c9d1f77066fe32d9..c34160eb55879f51c464c592934438b497923d90 160000 --- a/mil1553 +++ b/mil1553 @@ -1 +1 @@ -Subproject commit 8f0db2e2b80f77490ef98e64c9d1f77066fe32d9 +Subproject commit c34160eb55879f51c464c592934438b497923d90 diff --git a/msatt/driver/Makefile b/msatt/driver/Makefile index 2f9432093068dc8a96e63472e387f3468b8e7730..8b938b08baab77ed4a6952bb453bd4ce9093bc21 100644 --- a/msatt/driver/Makefile +++ b/msatt/driver/Makefile @@ -4,7 +4,7 @@ include ../../common.mk all: modules modules: - $(MAKE) -C $(KERNELSRC) M=`pwd` CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/mtt b/mtt index e879c3a9c25f51d1b9b3c1fb45559b6150c8b63d..5deb13f92e24cfb9fd73b2fdb8bfeed739d464d0 160000 --- a/mtt +++ b/mtt @@ -1 +1 @@ -Subproject commit e879c3a9c25f51d1b9b3c1fb45559b6150c8b63d +Subproject commit 5deb13f92e24cfb9fd73b2fdb8bfeed739d464d0 diff --git a/pickeringmux/driver/Makefile b/pickeringmux/driver/Makefile index 857b3d0fd24c7cf0788f5a6b979436d99367e573..60c83fac90de553afe38593233d5517a36510737 100644 --- a/pickeringmux/driver/Makefile +++ b/pickeringmux/driver/Makefile @@ -8,7 +8,7 @@ endif all: driver driver: - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/sis33/drivers/Makefile b/sis33/drivers/Makefile index 0ca822cc85ce4f02c16cbaae6a0a2265cd5b23b3..aa72762cbc98a87203b4aa16257d3d91430e7806 100644 --- a/sis33/drivers/Makefile +++ b/sis33/drivers/Makefile @@ -7,7 +7,7 @@ all: modules modules: cp Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p ./$(CPU)/$(KVER) mv *.o *.ko ./$(CPU)/$(KVER) diff --git a/vd80-2/driver/Makefile b/vd80-2/driver/Makefile index 531249a5017bbaca398c3cc0e3035027b7137358..d5ad3ce375bf14c926209704cf279ad9e68cb7c8 100644 --- a/vd80-2/driver/Makefile +++ b/vd80-2/driver/Makefile @@ -5,7 +5,7 @@ all: modules modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) diff --git a/vmebridge/driver/Makefile b/vmebridge/driver/Makefile index 17b48c22a70aa9776a5d6c458cffe89aa82dac17..9866db4e44fe5469e9842915493cf6a3da88a218 100644 --- a/vmebridge/driver/Makefile +++ b/vmebridge/driver/Makefile @@ -5,7 +5,7 @@ all: driver driver: modules modules: - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER) mv Module.symvers $(CPU)/$(KVER) diff --git a/vmebridge/drvrtest/Makefile b/vmebridge/drvrtest/Makefile index 6a0e35432831245c30053f846dcfebdfbbba308b..081dcbe26ccd37726b9a5175c23313ab2a36b4ea 100644 --- a/vmebridge/drvrtest/Makefile +++ b/vmebridge/drvrtest/Makefile @@ -17,7 +17,7 @@ vmeheaders: $(MAKE) -C ../include mymodules: vmedriver - $(MAKE) -C $(KERNELSRC) M=`pwd` CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` CROSS_COMPILE=$(CROSS_COMPILE) modules mkdir -p $(OUTPUTDIR) mv *.o *.ko $(OUTPUTDIR) diff --git a/vmod/driver/Makefile b/vmod/driver/Makefile index e13f61f1408bc15d9c0cedacf7e3e78ba95eaaaf..8ace8f59630be3e098885b3fb80bf8d8ff03765c 100644 --- a/vmod/driver/Makefile +++ b/vmod/driver/Makefile @@ -6,7 +6,7 @@ driver: modules modules: $(CP) Module.symvers.vmebus Module.symvers - $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(TOOLS) modules + $(MAKE) -C $(KERNELSRC) M=`pwd` GIT_VERSION=$(GIT_VERSION) CROSS_COMPILE=$(CROSS_COMPILE) modules $(MKDIR) -p $(CPU)/$(KVER) mv *.o *.ko $(CPU)/$(KVER)