Skip to content

F
FMC DEL 1ns 4cha
Commit 2b4007d0 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

removed spec-sw submodule, we are independent now 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent bfa384b9
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 37 deletions
.gitmodules
View file @ 2b4007d0
[submodule "spec-sw"]
path = spec-sw
url = git://ohwr.org/fmc-projects/spec/spec-sw.git
[submodule "zio"] [submodule "zio"]
path = zio path = zio
url = git://ohwr.org/misc/zio.git url = git://ohwr.org/misc/zio.git
......
Makefile
View file @ 2b4007d0
...@@ -22,7 +22,6 @@ gitmodules: ...@@ -22,7 +22,6 @@ gitmodules:
# The user can override, using environment variables, all these three: # The user can override, using environment variables, all these three:
FMC_BUS ?= fmc-bus FMC_BUS ?= fmc-bus
SPEC_SW ?= spec-sw
ZIO ?= zio ZIO ?= zio
SUBMOD = $(FMC_BUS) $(SPEC_SW) $(ZIO) SUBMOD = $(FMC_BUS) $(SPEC_SW) $(ZIO)
......
doc/fine-delay.in
View file @ 2b4007d0
...@@ -288,7 +288,7 @@ a TDC, pulse generator or a pulse delay. ...@@ -288,7 +288,7 @@ a TDC, pulse generator or a pulse delay.
@node Driver Features @node Driver Features
@chapter Driver Features @chapter Driver Features
This driver is based on ZIO and @i{spec-sw}. It supports initial This driver is based on ZIO and @i{fmc-bus}. It supports initial
setup of the board, setting and reading time, run-time continuous setup of the board, setting and reading time, run-time continuous
calibration, input timestamping and output pulse generation. It calibration, input timestamping and output pulse generation. It
supports user-defined offsets, so our users can tell the driver supports user-defined offsets, so our users can tell the driver
...@@ -355,7 +355,8 @@ but we are working to make this driver portable to other carriers. ...@@ -355,7 +355,8 @@ but we are working to make this driver portable to other carriers.
@section Gateware Installation @section Gateware Installation
To install the FPGA image in the target system, please follow the To install the FPGA image in the target system, please follow the
instruction in the documentation of @i{spec-sw} (version 2.1 or later). instruction in the documentation of @i{spec-sw} (version 2.1 or later),
or the one for your specific FMC carrier.
To summarize, you'll To summarize, you'll
need to place the @code{.bin} file, properly renamed, in need to place the @code{.bin} file, properly renamed, in
@i{/lib/firmware} or a subdirectory thereof. @i{/lib/firmware} or a subdirectory thereof.
...@@ -375,7 +376,8 @@ module parameters. ...@@ -375,7 +376,8 @@ module parameters.
@b{Note:} if you were used to version 1.1 or earlier of this package, @b{Note:} if you were used to version 1.1 or earlier of this package,
the rules about naming were different: we rearranged @i{spec-sw} the rules about naming were different: we rearranged @i{spec-sw}
in the meanwhile to be a more flexible framework for a wide range in the meanwhile to be a more flexible framework for a wide range
of mezzanines. of mezzanines, up to removing the dependency of this package
from @i{spec-sw}.
@c ========================================================================== @c ==========================================================================
@node Software Dependencies @node Software Dependencies
...@@ -397,11 +399,7 @@ software project. Such support used to be part of the @i{spec-sw} ...@@ -397,11 +399,7 @@ software project. Such support used to be part of the @i{spec-sw}
package, but is not a project of its own. This @i{fine-delay} package, but is not a project of its own. This @i{fine-delay}
kernel module registers as a @i{driver} for the FMC bus abstraction. kernel module registers as a @i{driver} for the FMC bus abstraction.
Until it is made completely portable across carriers, this driver Both packages are currently checked out as @i{git submodules}
relies on the SPEC carrier software. For this reason it uses
the @i{spec-sw} package, again from @code{ohwr.org}.
All three packages are currently checked out as @i{git submodules}
of this package, and each of them is retrieved at the right version of this package, and each of them is retrieved at the right version
to be compatible with this driver. This means you may just to be compatible with this driver. This means you may just
ignore software dependencies and everything should work. ignore software dependencies and everything should work.
...@@ -445,7 +443,7 @@ In addition to the normal installation procedure for ...@@ -445,7 +443,7 @@ In addition to the normal installation procedure for
WARNING: Consider "make prereq_install" WARNING: Consider "make prereq_install"
@end example @end example
The @i{prerequisite} packages are @i{zio}, @i{fmc-bus} and @i{spec-sw}; The @i{prerequisite} packages are @i{zio} and @i{fmc-bus};
unless you already installed your own preferred version, you are unless you already installed your own preferred version, you are
expected to install the version this packages suggests. This step expected to install the version this packages suggests. This step
can be performed by: can be performed by:
...@@ -1731,14 +1729,13 @@ of calibration). ...@@ -1731,14 +1729,13 @@ of calibration).
@chapter Known Bugs and Missing Features @chapter Known Bugs and Missing Features
This package is still work in progress, and unfortunately the same This package is still work in progress, and unfortunately the same
applies to the packages it depends on -- @i{zio}, @i{fmc-bus} and @i{spec-sw}. applies to the packages it depends on -- @i{zio} and @i{fmc-bus}.
@c ========================================================================== @c ==========================================================================
@node Bugs in Related Packages @node Bugs in Related Packages
@section Bugs in Related Packages @section Bugs in Related Packages
The current package set (i.e., @i{zio}, @i{fmc-bus}, The current package set (i.e., @i{zio}, @i{fmc-bus} and this one) has
@i{spec-sw} and this one) has
the following known issues exposed by @i{fine-delay}: the following known issues exposed by @i{fine-delay}:
@itemize @bullet @itemize @bullet
......
kernel/Makefile
View file @ 2b4007d0
LINUX ?= /lib/modules/$(shell uname -r)/build LINUX ?= /lib/modules/$(shell uname -r)/build
ZIO ?= $(M)/../zio ZIO ?= $(M)/../zio
SPEC_SW ?= $(M)/../spec-sw
FMC_BUS ?= $(M)/../fmc-bus FMC_BUS ?= $(M)/../fmc-bus
KBUILD_EXTRA_SYMBOLS := \ KBUILD_EXTRA_SYMBOLS := \
$(ZIO)/Module.symvers \ $(ZIO)/Module.symvers \
$(SPEC_SW)/kernel/Module.symvers \
$(FMC_BUS)/kernel/Module.symvers $(FMC_BUS)/kernel/Module.symvers
ccflags-y = \ ccflags-y = \
-I$(ZIO)/include \ -I$(ZIO)/include \
-I$(SPEC_SW)/kernel \
-I$(SPEC_SW)/kernel/include \
-I$(FMC_BUS)/kernel/include \ -I$(FMC_BUS)/kernel/include \
-I$M -I$M
......
kernel/fd-zio.c
View file @ 2b4007d0
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <linux/fmc.h> #include <linux/fmc.h>
#include "spec.h"
#include "fine-delay.h" #include "fine-delay.h"
#include "hw/fd_main_regs.h" #include "hw/fd_main_regs.h"
#include "hw/fd_channel_regs.h" #include "hw/fd_channel_regs.h"
...@@ -668,7 +667,6 @@ void fd_zio_unregister(void) ...@@ -668,7 +667,6 @@ void fd_zio_unregister(void)
int fd_zio_init(struct fd_dev *fd) int fd_zio_init(struct fd_dev *fd)
{ {
int err = 0; int err = 0;
struct pci_dev *pdev;
int dev_id; int dev_id;
fd->hwzdev = zio_allocate_device(); fd->hwzdev = zio_allocate_device();
...@@ -679,20 +677,7 @@ int fd_zio_init(struct fd_dev *fd) ...@@ -679,20 +677,7 @@ int fd_zio_init(struct fd_dev *fd)
fd->hwzdev->owner = THIS_MODULE; fd->hwzdev->owner = THIS_MODULE;
fd->hwzdev->private_data = fd; fd->hwzdev->private_data = fd;
if (!strcmp(fd->fmc->carrier_name, "SPEC")) { /* devid <= bus+devfn */ dev_id = fd->fmc->device_id;
struct spec_dev *spec;
spec = fd->fmc->carrier_data;
pdev = spec->pdev;
dev_id = (pdev->bus->number << 8) | pdev->devfn;
} else {
/* Please fill this with other carriers. SVEC? */
static int count;
dev_warn(fd->fmc->hwdev, "Unknown FMC carrier \"%s\":"
" using ID %i\n", fd->fmc->carrier_name, count);
dev_id = count++;
}
err = zio_register_device(fd->hwzdev, "fd", dev_id); err = zio_register_device(fd->hwzdev, "fd", dev_id);
if (err) { if (err) {
......
spec-sw @ 81268396
Subproject commit 81268396e3910235eb419a93ec50d1784f0b8d47
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