Merge branch 'klyone-20190412-fix_copyright_licenses' into 'master'

Klyone 20190412 fix copyright licenses See merge request !3

Merge branch 'klyone-20190412-fix_copyright_licenses' into 'master'
Klyone 20190412 fix copyright licenses See merge request !3
64cdaa71 · Benoit Rat · 2ff6c419 · aef6f1fb · 3a0e82ca · 64cdaa71
Commit 64cdaa71 authored Dec 11, 2019 by Benoit Rat
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

wr-cores hdl/ip_cores/wr-cores +1 -1

nic_top.vhd hdl/top/nic/nic_top.vhd +2 -2

device.c sw/kernel/device.c +1 -3

No files found.
--- a/wr-cores @ 3a0e82ca
+++ b/wr-cores @ 3a0e82ca
-Subproject commit 4e5e3dfc01e395a81d9403bd1e150560972685f7
+Subproject commit 3a0e82cabaed8e7d738b09be03981e38d66ea1b6
--- a/hdl/top/nic/nic_top.vhd
+++ b/hdl/top/nic/nic_top.vhd
@@ -7,7 +7,7 @@
 -- Author(s)  : Miguel Jimenez-Lopez
 -- Company    : Seven Solutions
 -- Created    : 2019-03-28
-- Last update: 2019-08-27
+-- Last update: 2019-12-04
 -- Standard   : VHDL'93
 -------------------------------------------------------------------------------
 -- Description: Top-level file for the reference design of the WR-NIC in the
@@ -17,7 +17,7 @@
 -- WR-NIC: https://www.ohwr.org/project/wr-nic
 --
 -------------------------------------------------------------------------------
-- Copyright (c) 2019 Seven Solutions
+-- Copyright (c) 2019 CERN (www.cern.ch)
 -------------------------------------------------------------------------------
 -- GNU LESSER GENERAL PUBLIC LICENSE
 --

--- a/sw/kernel/device.c
+++ b/sw/kernel/device.c
 /*
 * Device initialization and cleanup for White-Rabbit switch network interface
- * 
- * Copyright (C) 2019 Seven Solutions (sevensols.com)
- * Author: Miguel Jimenez Lopez <miguel.jimenez@sevensols.com>
 *
 * Copyright (C) 2010 CERN (www.cern.ch)
 * Author: Alessandro Rubini <rubini@gnudd.com>
+ * Author: Miguel Jimenez Lopez <miguel.jimenez@sevensols.com>
 * Partly from previous work by Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
 * Partly from previous work by  Emilio G. Cota <cota@braap.org>
 *