Merge branch 'release/v1.4.10'

0a4e3fcc · Federico Vaga · 7179590e · fb974131 · 0a4e3fcc · 0a4e3fcc
Commit 0a4e3fcc authored Apr 24, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 31 additions and 1 deletion

CHANGELOG.rst CHANGELOG.rst +10 -0

Makefile software/kernel/Makefile +20 -0

spec-core.c software/kernel/spec-core.c +1 -1

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
 Changelog
 =========

+[1.4.10] 2020-04-24
+===================
+Changed
+-------
+- [bld] assign dependencies path based on REPO_PARENT
+- [bld] check for missing dependencies
+
+Fixed
+-----
+- [sw] fix kernel crash when programming new bitstream

 [1.4.9] 2020-03-10
 ==================

--- a/software/kernel/Makefile
+++ b/software/kernel/Makefile
@@ -29,6 +29,26 @@ I2C ?= $(DKMSTREE)/i2c-ocores/$(I2C_VERSION)/source
 SPI ?= $(DKMSTREE)/spi-ocores/$(SPI_VERSION)/source
 endif

+ifdef REPO_PARENT
+FPGA_MGR ?= $(REPO_PARENT)/fpga-mgr-backport/
+FMC ?= $(REPO_PARENT)/fmc-sw/
+I2C ?= $(REPO_PARENT)/general-cores/software/i2c-ocores/
+SPI ?= $(REPO_PARENT)/general-cores/software/spi-ocores/
+endif
+
+ifndef FPGA_MGR
+$(error "Missing FPGA_MGR environment variable")
+endif
+ifndef FMC
+$(error "Missing FMC environment variable")
+endif
+ifndef I2C
+$(error "Missing I2C environment variable")
+endif
+ifndef SPI
+$(error "Missing SPI environment variable")
+endif
+
 FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR))
 FMC_ABS ?= $(abspath $(FMC))
 I2C_ABS ?= $(abspath $(I2C))

--- a/software/kernel/spec-core.c
+++ b/software/kernel/spec-core.c
@@ -90,7 +90,7 @@ static ssize_t spec_dbg_fw_write(struct file *file,
 	if (err)
 		return -EFAULT;

-	err = spec_fw_load(spec_gn412x, buf);
+	err = spec_fw_load(spec_gn412x, buf_l);
 	if (err)
 		return err;
 	return count;