Skip to content

S
Simple PCIe FMC carrier SPEC
Commit c8b88553 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'release/v1.4.4'

parents abbf3bf6 706c5fcd
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
CHANGELOG.rst
View file @ c8b88553
...@@ -2,6 +2,15 @@ ...@@ -2,6 +2,15 @@
Changelog 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 [1.4.3] - 2019-10-17
==================== ====================
Fixed Fixed
......
software/Makefile
View file @ c8b88553
-include Makefile.specific -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 -include $(REPO_PARENT)/parent_common.mk
DIRS = kernel DIRS = kernel
......
software/kernel/Kbuild
View file @ c8b88553
...@@ -7,15 +7,12 @@ endif ...@@ -7,15 +7,12 @@ endif
endif endif
# add versions of used submodules # 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 += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
ccflags-y += -DVERSION=\"$(VERSION)\" ccflags-y += -DVERSION=\"$(VERSION)\"
ccflags-y += -Wall -Werror 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) += -DCONFIG_FPGA_MGR_BACKPORT
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE)
ccflags-y += -I$(FMC_ABS)/include ccflags-y += -I$(FMC_ABS)/include
ccflags-y += -I$(SPI_ABS)/include ccflags-y += -I$(SPI_ABS)/include
...@@ -23,8 +20,10 @@ 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) 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) ifeq ($(CONFIG_FPGA_MGR_BACKPORT), y)
LINUXINCLUDE := $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE) $(LINUXINCLUDE) FPGA_MGR_BACKPORT_INCLUDE := -I$(FPGA_MGR_ABS)/include
KBUILD_EXTRA_SYMBOLS += $(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/drivers/fpga/Module.symvers 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 endif
KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers
......
software/kernel/Makefile
View file @ c8b88553
-include Makefile.specific -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 -include $(REPO_PARENT)/parent_common.mk
KVERSION ?= $(shell uname -r) KVERSION ?= $(shell uname -r)
...@@ -32,7 +29,7 @@ I2C ?= $(DKMSTREE)/i2c-ocores/$(I2C_VERSION)/source ...@@ -32,7 +29,7 @@ I2C ?= $(DKMSTREE)/i2c-ocores/$(I2C_VERSION)/source
SPI ?= $(DKMSTREE)/spi-ocores/$(SPI_VERSION)/source SPI ?= $(DKMSTREE)/spi-ocores/$(SPI_VERSION)/source
endif endif
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS ?= $(abspath $(CONFIG_FPGA_MGR_BACKPORT_PATH)) FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR))
FMC_ABS ?= $(abspath $(FMC)) FMC_ABS ?= $(abspath $(FMC))
I2C_ABS ?= $(abspath $(I2C)) I2C_ABS ?= $(abspath $(I2C))
SPI_ABS ?= $(abspath $(SPI)) SPI_ABS ?= $(abspath $(SPI))
...@@ -60,7 +57,7 @@ clean: clean-spec-core-fpga.h ...@@ -60,7 +57,7 @@ clean: clean-spec-core-fpga.h
modules help coccicheck modules_install clean: spec-core-fpga.h modules help coccicheck modules_install clean: spec-core-fpga.h
$(MAKE) -C $(LINUX) M=$(shell pwd) \ $(MAKE) -C $(LINUX) M=$(shell pwd) \
VERSION=$(VERSION) \ 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) \ CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) \
FMC_ABS=$(FMC_ABS) \ FMC_ABS=$(FMC_ABS) \
I2C_ABS=$(I2C_ABS) \ I2C_ABS=$(I2C_ABS) \
......
software/kernel/gn412x-fcl.c
View file @ c8b88553
...@@ -591,7 +591,7 @@ static const struct platform_device_id gn412x_fcl_id[] = { ...@@ -591,7 +591,7 @@ static const struct platform_device_id gn412x_fcl_id[] = {
{ {
.name = "gn412x-fcl", .name = "gn412x-fcl",
}, },
{ .name = "" }, /* last */ {}, /* last */
}; };
static struct platform_driver gn412x_fcl_platform_driver = { static struct platform_driver gn412x_fcl_platform_driver = {
......
software/kernel/gn412x-gpio.c
View file @ c8b88553
...@@ -582,7 +582,7 @@ static const struct platform_device_id gn412x_gpio_id[] = { ...@@ -582,7 +582,7 @@ static const struct platform_device_id gn412x_gpio_id[] = {
{ {
.name = "gn412x-gpio", .name = "gn412x-gpio",
}, },
{ .name = "" }, /* last */ {}, /* last */
}; };
static struct platform_driver gn412x_gpio_platform_driver = { static struct platform_driver gn412x_gpio_platform_driver = {
......
software/kernel/spec-core.c
View file @ c8b88553
...@@ -280,11 +280,13 @@ static int spec_gpio_init_table(struct spec_gn412x *spec_gn412x) ...@@ -280,11 +280,13 @@ static int spec_gpio_init_table(struct spec_gn412x *spec_gn412x)
struct gpiod_lookup_table *lookup; struct gpiod_lookup_table *lookup;
int err = 0; 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) if (!lookup)
return -ENOMEM; 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) if (!lookup->dev_id)
goto err_dup; goto err_dup;
......
software/kernel/spec-gn412x-dma.c
View file @ c8b88553
...@@ -870,7 +870,7 @@ static const struct platform_device_id gn412x_dma_id[] = { ...@@ -870,7 +870,7 @@ static const struct platform_device_id gn412x_dma_id[] = {
.name = "spec-gn412x-dma", .name = "spec-gn412x-dma",
.driver_data = GN412X_DMA_GN4124_IPCORE, .driver_data = GN412X_DMA_GN4124_IPCORE,
}, },
{ .name = "" }, /* last */ {}, /* last */
}; };
struct platform_driver gn412x_dma_driver = { struct platform_driver gn412x_dma_driver = {
......
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