Skip to content

S
Simple VME FMC Carrier SVEC
Commit 131f3512 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'release/v1.4.12'

parents aa017290 7d85d3b7
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 3 deletions
CHANGELOG.rst
View file @ 131f3512
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
Change Log Change Log
========== ==========
[1.4.12] 2020-06-03
===================
Added
-----
- [hdl] ignore autogenerated files to build metadata (otherwise the repository
is always marked as dirty)
Fixed
-----
- [sw] impossibility of loading application because of wrong address space
[1.4.11] 2020-05-20 [1.4.11] 2020-05-20
=================== ===================
Added Added
......
hdl/rtl/.gitignore 0 → 100644
View file @ 131f3512
sourceid_svec_base_pkg.vhd
software/kernel/svec-core-fpga.c
View file @ 131f3512
...@@ -646,7 +646,8 @@ static int svec_fpga_app_init(struct svec_fpga *svec_fpga) ...@@ -646,7 +646,8 @@ static int svec_fpga_app_init(struct svec_fpga *svec_fpga)
#define SVEC_FPGA_APP_NAME_MAX 47 #define SVEC_FPGA_APP_NAME_MAX 47
#define SVEC_FPGA_APP_IRQ_BASE 6 #define SVEC_FPGA_APP_IRQ_BASE 6
#define SVEC_FPGA_APP_RES_N (32 - SVEC_FPGA_APP_IRQ_BASE + 1) #define SVEC_FPGA_APP_RES_N (32 - SVEC_FPGA_APP_IRQ_BASE + 1)
struct vme_dev *vdev = to_vme_dev(svec_fpga->dev.parent); struct svec_dev *svec_dev = to_svec_dev(svec_fpga->dev.parent);
struct vme_dev *vdev = to_vme_dev(svec_dev->dev.parent);
unsigned int res_n = SVEC_FPGA_APP_RES_N; unsigned int res_n = SVEC_FPGA_APP_RES_N;
struct resource *res; struct resource *res;
struct platform_device *pdev; struct platform_device *pdev;
...@@ -699,14 +700,19 @@ static int svec_fpga_app_init(struct svec_fpga *svec_fpga) ...@@ -699,14 +700,19 @@ static int svec_fpga_app_init(struct svec_fpga *svec_fpga)
app_name, SVEC_FPGA_APP_NAME_MAX); app_name, SVEC_FPGA_APP_NAME_MAX);
if (err) if (err)
goto err_free; goto err_free;
dev_info(&svec_fpga->dev,
"Application \"%s\" found at offset: 0x%08lx (res: %pr)\n",
app_name, app_offset, &res[0]);
svec_fpga_app_restart(svec_fpga); svec_fpga_app_restart(svec_fpga);
pdev = platform_device_register_resndata(&svec_fpga->dev, pdev = platform_device_register_resndata(&svec_fpga->dev,
app_name, PLATFORM_DEVID_AUTO, app_name, PLATFORM_DEVID_AUTO,
res, res_n, res, res_n,
NULL, 0); NULL, 0);
err = IS_ERR(pdev); if (IS_ERR(pdev)) {
if (err) err = PTR_ERR(pdev);
goto err_free; goto err_free;
}
svec_fpga->app_pdev = pdev; svec_fpga->app_pdev = pdev;
......
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