diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e623cfa5134b2b1468d87ab5bd87543fa8d64d07..e764b4194b203438be0f507152fa0f16227ffb36 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +[1.4.4] 2019-12-17 +================== +Changed +----- +- [sw] better integration in coht, rename environment variable to FPGA_MGR +Fixed +----- +- [sw] suggested fixed reported by checkpatch and coccicheck + [1.4.3] - 2019-10-17 ==================== Fixed diff --git a/software/Makefile b/software/Makefile index fd02cc75837e6af54647b829f23cf3b141615125..5807c2e56912de5aa934ce954935b696f860188a 100644 --- a/software/Makefile +++ b/software/Makefile @@ -1,8 +1,4 @@ -include Makefile.specific - -# include parent_common.mk for buildsystem's defines -#use absolute path for REPO_PARENT -REPO_PARENT ?= $(shell /bin/pwd)/.. -include $(REPO_PARENT)/parent_common.mk DIRS = kernel diff --git a/software/kernel/Kbuild b/software/kernel/Kbuild index 4bf4fa22f1c06bca72335fe1ae9a98aa5fd917c6..9a952809ab63f0219051226d011f4404e718e02a 100644 --- a/software/kernel/Kbuild +++ b/software/kernel/Kbuild @@ -7,15 +7,12 @@ endif endif # add versions of used submodules -CONFIG_FPGA_MGR_BACKPORT_INCLUDE := -I$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/include -CONFIG_FPGA_MGR_BACKPORT_INCLUDE += -I$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/include/linux - ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)" ccflags-y += -DVERSION=\"$(VERSION)\" ccflags-y += -Wall -Werror +ccflags-y += -I$(FPGA_MGR_ABS)/include ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT -ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE) ccflags-y += -I$(FMC_ABS)/include ccflags-y += -I$(SPI_ABS)/include @@ -23,8 +20,10 @@ ccflags-y += -I$(SPI_ABS)/include LINUXINCLUDE := -I$(FMC_ABS)/include -I$(FMC_ABS)/include/linux -I$(I2C_ABS)/include -I$(I2C_ABS)/include/linux $(LINUXINCLUDE) ifeq ($(CONFIG_FPGA_MGR_BACKPORT), y) -LINUXINCLUDE := $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE) $(LINUXINCLUDE) -KBUILD_EXTRA_SYMBOLS += $(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/drivers/fpga/Module.symvers +FPGA_MGR_BACKPORT_INCLUDE := -I$(FPGA_MGR_ABS)/include +FPGA_MGR_BACKPORT_INCLUDE += -I$(FPGA_MGR_ABS)/include/linux +LINUXINCLUDE := $(FPGA_MGR_BACKPORT_INCLUDE) $(LINUXINCLUDE) +KBUILD_EXTRA_SYMBOLS += $(FPGA_MGR_ABS)/drivers/fpga/Module.symvers endif KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers diff --git a/software/kernel/Makefile b/software/kernel/Makefile index 0a10bdccd17468b39d1c0ee1226d8229f97c99d8..184d4daf89f00152b25b68744c3992dfdcec4c2c 100644 --- a/software/kernel/Makefile +++ b/software/kernel/Makefile @@ -1,7 +1,4 @@ -include Makefile.specific -# include parent_common.mk for buildsystem's defines -#use absolute path for REPO_PARENT -REPO_PARENT ?= $(shell /bin/pwd)/../.. -include $(REPO_PARENT)/parent_common.mk KVERSION ?= $(shell uname -r) @@ -32,7 +29,7 @@ I2C ?= $(DKMSTREE)/i2c-ocores/$(I2C_VERSION)/source SPI ?= $(DKMSTREE)/spi-ocores/$(SPI_VERSION)/source endif -CONFIG_FPGA_MGR_BACKPORT_PATH_ABS ?= $(abspath $(CONFIG_FPGA_MGR_BACKPORT_PATH)) +FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR)) FMC_ABS ?= $(abspath $(FMC)) I2C_ABS ?= $(abspath $(I2C)) SPI_ABS ?= $(abspath $(SPI)) @@ -60,7 +57,7 @@ clean: clean-spec-core-fpga.h modules help coccicheck modules_install clean: spec-core-fpga.h $(MAKE) -C $(LINUX) M=$(shell pwd) \ VERSION=$(VERSION) \ - CONFIG_FPGA_MGR_BACKPORT_PATH_ABS=$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS) \ + FPGA_MGR_ABS=$(FPGA_MGR_ABS) \ CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) \ FMC_ABS=$(FMC_ABS) \ I2C_ABS=$(I2C_ABS) \ diff --git a/software/kernel/gn412x-fcl.c b/software/kernel/gn412x-fcl.c index 50cda248158fea706443981a842defb90319e135..667e760bff2b1faaeff3ae4514d7c944693accca 100644 --- a/software/kernel/gn412x-fcl.c +++ b/software/kernel/gn412x-fcl.c @@ -591,7 +591,7 @@ static const struct platform_device_id gn412x_fcl_id[] = { { .name = "gn412x-fcl", }, - { .name = "" }, /* last */ + {}, /* last */ }; static struct platform_driver gn412x_fcl_platform_driver = { diff --git a/software/kernel/gn412x-gpio.c b/software/kernel/gn412x-gpio.c index fa7003c05b2f1dfe4fd787a98f9c24d9ee646cfb..c05c6b51a76a7f38556a5f448fe8459b0cf61883 100644 --- a/software/kernel/gn412x-gpio.c +++ b/software/kernel/gn412x-gpio.c @@ -582,7 +582,7 @@ static const struct platform_device_id gn412x_gpio_id[] = { { .name = "gn412x-gpio", }, - { .name = "" }, /* last */ + {}, /* last */ }; static struct platform_driver gn412x_gpio_platform_driver = { diff --git a/software/kernel/spec-core.c b/software/kernel/spec-core.c index c338c194b169a25dca15bdb33c6385eebbd3f43e..9f5cee722d8ce13cf8af2dbbcaf3b2ddc99f1105 100644 --- a/software/kernel/spec-core.c +++ b/software/kernel/spec-core.c @@ -280,11 +280,13 @@ static int spec_gpio_init_table(struct spec_gn412x *spec_gn412x) struct gpiod_lookup_table *lookup; int err = 0; - lookup = kmemdup(&spec_gpiod_table, spec_gpiod_table_size(), GFP_KERNEL); + lookup = kmemdup(&spec_gpiod_table, spec_gpiod_table_size(), + GFP_KERNEL); if (!lookup) return -ENOMEM; - lookup->dev_id = kstrdup(dev_name(&spec_gn412x->pdev->dev), GFP_KERNEL); + lookup->dev_id = kstrdup(dev_name(&spec_gn412x->pdev->dev), + GFP_KERNEL); if (!lookup->dev_id) goto err_dup; diff --git a/software/kernel/spec-gn412x-dma.c b/software/kernel/spec-gn412x-dma.c index a86173777ef034d6f7ef94217d56638592758c97..8720d5c06a91bfbac65038f8f38de557d2894ada 100644 --- a/software/kernel/spec-gn412x-dma.c +++ b/software/kernel/spec-gn412x-dma.c @@ -870,7 +870,7 @@ static const struct platform_device_id gn412x_dma_id[] = { .name = "spec-gn412x-dma", .driver_data = GN412X_DMA_GN4124_IPCORE, }, - { .name = "" }, /* last */ + {}, /* last */ }; struct platform_driver gn412x_dma_driver = {