Skip to content

F
FMC DEL 1ns 4cha - Software
Commit 5118aaac authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

fmc-bus is now a standalone project: fix accordingly 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent fcddc1cd
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 3 deletions
Makefile
View file @ 5118aaac
...@@ -2,10 +2,19 @@ ...@@ -2,10 +2,19 @@
LINUX ?= /lib/modules/$(shell uname -r)/build LINUX ?= /lib/modules/$(shell uname -r)/build
ZIO ?= $(HOME)/zio ZIO ?= $(HOME)/zio
SPEC_SW ?= $(HOME)/spec-sw SPEC_SW ?= $(HOME)/spec-sw
FMC_BUS ?= $(HOME)/fmc-bus
KBUILD_EXTRA_SYMBOLS := $(ZIO)/Module.symvers $(SPEC_SW)/kernel/Module.symvers KBUILD_EXTRA_SYMBOLS := \
$(ZIO)/Module.symvers \
$(SPEC_SW)/kernel/Module.symvers \
$(FMC_BUS)/kernel/Module.sysmvers
ccflags-y = -I$(ZIO)/include -I$(SPEC_SW)/kernel -I$(SPEC_SW)/kernel/include \
ccflags-y = \
-I$(ZIO)/include \
-I$(SPEC_SW)/kernel \
-I$(SPEC_SW)/kernel/include \
-I$(FMC_BUS)/kernel/include \
-I$M -I$M
#ccflags-y += -DDEBUG #ccflags-y += -DDEBUG
......
doc/fine-delay.in
View file @ 5118aaac
...@@ -420,6 +420,13 @@ branch of ZIO, until I'll attack backporting as needed. ...@@ -420,6 +420,13 @@ branch of ZIO, until I'll attack backporting as needed.
Similarly, this is a sub-module for the SPEC board, and thus relies Similarly, this is a sub-module for the SPEC board, and thus relies
on code from the @i{spec-sw} package, again from @code{ohwr.org}. on code from the @i{spec-sw} package, again from @code{ohwr.org}.
Finally, the driver depends on the @i{fmc-bus} abstraction, which used
to be part of @i{spec-sw} but it is now a separate @code{ohwr}
project.
@b{Note}: this setup is temporary, because we are going to use @i{git}
submodules to simplify the installation for fine-delay users.
@c ========================================================================== @c ==========================================================================
@node Software Installation @node Software Installation
@section Software Installation @section Software Installation
...@@ -442,6 +449,10 @@ them are assumed to be already set when running the commands shown. ...@@ -442,6 +449,10 @@ them are assumed to be already set when running the commands shown.
The top-level directory of the @i{spec-sw} repository checkout. The top-level directory of the @i{spec-sw} repository checkout.
@item FMC_BUS
The top level directory of the @i{fmc-bus} repository checkout.
@end table @end table
To install ZIO you should download it and install it. For this To install ZIO you should download it and install it. For this
...@@ -472,6 +483,9 @@ the official version 2.1. ...@@ -472,6 +483,9 @@ the official version 2.1.
sudo make modules_install sudo make modules_install
@end example @end example
The procedure for @i{fmc-bus} is the same, using the current
master branch.
At this point all the software modules are ready to be loaded. At this point all the software modules are ready to be loaded.
Unlikely what happened with previous versions of this package, Unlikely what happened with previous versions of this package,
if you @i{modprobe} for @code{spec-fine-delay} you won't have if you @i{modprobe} for @code{spec-fine-delay} you won't have
...@@ -567,7 +581,7 @@ framework: ...@@ -567,7 +581,7 @@ framework:
match the @i{busid} parameters, in the same order. This match the @i{busid} parameters, in the same order. This
means that you can't make the driver load a different gateware means that you can't make the driver load a different gateware
file without passing the respective @i{busid}. Actually, to file without passing the respective @i{busid}. Actually, to
change the gateware for all boards, you mat just replace change the gateware for all boards, you may just replace
the file in @file{/lib/firmware}. (Maybe I'll add an the file in @file{/lib/firmware}. (Maybe I'll add an
option to change the name at load time for all boards). option to change the name at load time for all boards).
@c FIXME: name for gateware file @c FIXME: name for gateware file
......
fd-core.c
View file @ 5118aaac
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/fmc.h>
#include <linux/fmc-sdb.h>
#include "spec.h" #include "spec.h"
#include "fine-delay.h" #include "fine-delay.h"
#include "hw/fd_main_regs.h" #include "hw/fd_main_regs.h"
...@@ -250,6 +253,7 @@ int fd_remove(struct fmc_device *fmc) ...@@ -250,6 +253,7 @@ int fd_remove(struct fmc_device *fmc)
} }
static struct fmc_driver fd_drv = { static struct fmc_driver fd_drv = {
.version = FMC_VERSION,
.driver.name = KBUILD_MODNAME, .driver.name = KBUILD_MODNAME,
.probe = fd_probe, .probe = fd_probe,
.remove = fd_remove, .remove = fd_remove,
......
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