Merge commit 'b39260f04b9b0a9da8a337098f73cbca7c4e9b2d' of https://github.com/Netronome/linux-firmware

2017-12-06 17:31:31 -08:00 · 2017-12-06 17:31:31 -08:00 · bc2164d5ed
parent fdee922a78 b39260f04b
commit bc2164d5ed
29 changed files with 32 additions and 2 deletions
--- a/LICENCE.Netronome
+++ b/LICENCE.Netronome
@ -1,6 +1,6 @@
 Copyright (c) 2017, NETRONOME Systems, Inc. All rights reserved.

-Agilio(r) CoreNIC Firmware License Agreement (the "AGREEMENT")
+Agilio(r) Firmware License Agreement (the "AGREEMENT")

 BY INSTALLING OR USING IN ANY MANNER THE SOFTWARE THAT ACCOMPANIES THIS
 AGREEMENT (THE "SOFTWARE") YOU (THE "LICENSEE") ACKNOWLEDGE TO BE BOUND
--- a/24
+++ b/24
@ -3732,8 +3732,30 @@ File: netronome/nic_AMDA0097-0001_4x10_1x40.nffw
 File: netronome/nic_AMDA0099-0001_2x25.nffw
 File: netronome/nic_AMDA0096-0001_2x10.nffw
 File: netronome/nic_AMDA0097-0001_8x10.nffw
+File: netronome/nic/nic_AMDA0081-0001_1x40.nffw
+File: netronome/nic/nic_AMDA0097-0001_2x40.nffw
+File: netronome/nic/nic_AMDA0099-0001_2x10.nffw
+File: netronome/nic/nic_AMDA0081-0001_4x10.nffw
+File: netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
+File: netronome/nic/nic_AMDA0099-0001_2x25.nffw
+File: netronome/nic/nic_AMDA0096-0001_2x10.nffw
+File: netronome/nic/nic_AMDA0097-0001_8x10.nffw

-Version: v0.6.1
+Version: v2.0.0
+
+File: netronome/flower/nic_AMDA0099.nffw
+File: netronome/flower/nic_AMDA0096.nffw
+File: netronome/flower/nic_AMDA0097.nffw
+File: netronome/flower/nic_AMDA0081-0001_1x40.nffw
+File: netronome/flower/nic_AMDA0097-0001_2x40.nffw
+File: netronome/flower/nic_AMDA0099-0001_2x10.nffw
+File: netronome/flower/nic_AMDA0081-0001_4x10.nffw
+File: netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
+File: netronome/flower/nic_AMDA0099-0001_2x25.nffw
+File: netronome/flower/nic_AMDA0096-0001_2x10.nffw
+File: netronome/flower/nic_AMDA0097-0001_8x10.nffw
+
+Version: r5642

 Licence: Redistributable. See LICENCE.Netronome for details

--- a/netronome/flower/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/flower/nic_AMDA0081-0001_1x40.nffw
@ -0,0 +1 @@
+nic_AMDA0097.nffw
--- a/netronome/flower/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/flower/nic_AMDA0081-0001_4x10.nffw
@ -0,0 +1 @@
+nic_AMDA0097.nffw
--- a/netronome/flower/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/flower/nic_AMDA0096-0001_2x10.nffw
@ -0,0 +1 @@
+nic_AMDA0096.nffw
--- a/netronome/flower/nic_AMDA0096.nffw
+++ b/netronome/flower/nic_AMDA0096.nffw
--- a/netronome/flower/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/flower/nic_AMDA0097-0001_2x40.nffw
@ -0,0 +1 @@
+nic_AMDA0097.nffw
--- a/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
@ -0,0 +1 @@
+nic_AMDA0097.nffw
--- a/netronome/flower/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/flower/nic_AMDA0097-0001_8x10.nffw
@ -0,0 +1 @@
+nic_AMDA0097.nffw
--- a/netronome/flower/nic_AMDA0097.nffw
+++ b/netronome/flower/nic_AMDA0097.nffw
--- a/netronome/flower/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/flower/nic_AMDA0099-0001_2x10.nffw
@ -0,0 +1 @@
+nic_AMDA0099.nffw
--- a/netronome/flower/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/flower/nic_AMDA0099-0001_2x25.nffw
@ -0,0 +1 @@
+nic_AMDA0099.nffw
--- a/netronome/flower/nic_AMDA0099.nffw
+++ b/netronome/flower/nic_AMDA0099.nffw
--- a/netronome/nic/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/nic/nic_AMDA0081-0001_1x40.nffw
--- a/netronome/nic/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/nic/nic_AMDA0081-0001_4x10.nffw
--- a/netronome/nic/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/nic/nic_AMDA0096-0001_2x10.nffw
--- a/netronome/nic/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/nic/nic_AMDA0097-0001_2x40.nffw
--- a/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
--- a/netronome/nic/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/nic/nic_AMDA0097-0001_8x10.nffw
--- a/netronome/nic/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/nic/nic_AMDA0099-0001_2x10.nffw
--- a/netronome/nic/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic/nic_AMDA0099-0001_2x25.nffw
--- a/netronome/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/nic_AMDA0081-0001_1x40.nffw
--- a/netronome/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/nic_AMDA0081-0001_1x40.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0081-0001_1x40.nffw
--- a/netronome/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/nic_AMDA0081-0001_4x10.nffw
--- a/netronome/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/nic_AMDA0081-0001_4x10.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0081-0001_4x10.nffw
--- a/netronome/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/nic_AMDA0096-0001_2x10.nffw
--- a/netronome/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/nic_AMDA0096-0001_2x10.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0096-0001_2x10.nffw
--- a/netronome/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/nic_AMDA0097-0001_2x40.nffw
--- a/netronome/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/nic_AMDA0097-0001_2x40.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0097-0001_2x40.nffw
--- a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
--- a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0097-0001_4x10_1x40.nffw
--- a/netronome/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/nic_AMDA0097-0001_8x10.nffw
--- a/netronome/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/nic_AMDA0097-0001_8x10.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0097-0001_8x10.nffw
--- a/netronome/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/nic_AMDA0099-0001_2x10.nffw
--- a/netronome/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/nic_AMDA0099-0001_2x10.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0099-0001_2x10.nffw
--- a/netronome/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic_AMDA0099-0001_2x25.nffw
--- a/netronome/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic_AMDA0099-0001_2x25.nffw
@ -0,0 +1 @@
+nic/nic_AMDA0099-0001_2x25.nffw