Merge https://github.com/Netronome/linux-firmware into netro

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
7 years ago · a3be6d433f
16 changed files with 19 additions and 10 deletions
--- a/26
+++ b/26
@ -3796,15 +3796,18 @@ Licence: Redistributable. See LICENCE.ralink_a_mediatek_company_firmware for det
				@@ -3796,15 +3796,18 @@ Licence: Redistributable. See LICENCE.ralink_a_mediatek_company_firmware for det

 Driver: nfp - Netronome Flow Processor

-File: netronome/nic_AMDA0081-0001_1x40.nffw
-File: netronome/nic_AMDA0097-0001_2x40.nffw
-File: netronome/nic_AMDA0099-0001_2x10.nffw
-File: netronome/nic_AMDA0081-0001_4x10.nffw
-File: netronome/nic_AMDA0097-0001_4x10_1x40.nffw
-File: netronome/nic_AMDA0099-0001_1x10_1x25.nffw
-File: netronome/nic_AMDA0099-0001_2x25.nffw
-File: netronome/nic_AMDA0096-0001_2x10.nffw
-File: netronome/nic_AMDA0097-0001_8x10.nffw
+Link: netronome/nic_AMDA0081-0001_1x40.nffw -> nic/nic_AMDA0081-0001_1x40.nffw
+Link: netronome/nic_AMDA0097-0001_2x40.nffw -> nic/nic_AMDA0097-0001_2x40.nffw
+Link: netronome/nic_AMDA0099-0001_2x10.nffw -> nic/nic_AMDA0099-0001_2x10.nffw
+Link: netronome/nic_AMDA0081-0001_4x10.nffw -> nic/nic_AMDA0081-0001_4x10.nffw
+Link: netronome/nic_AMDA0097-0001_4x10_1x40.nffw -> nic/nic_AMDA0097-0001_4x10_1x40.nffw
+Link: netronome/nic_AMDA0099-0001_1x10_1x25.nffw -> nic/nic_AMDA0099-0001_1x10_1x25.nffw
+Link: netronome/nic_AMDA0099-0001_2x25.nffw -> nic/nic_AMDA0099-0001_2x25.nffw
+Link: netronome/nic_AMDA0096-0001_2x10.nffw -> nic/nic_AMDA0096-0001_2x10.nffw
+Link: netronome/nic_AMDA0097-0001_8x10.nffw -> nic/nic_AMDA0097-0001_8x10.nffw
+Link: netronome/nic_AMDA0058-0011_2x40.nffw -> nic/nic_AMDA0058-0011_2x40.nffw
+Link: netronome/nic_AMDA0058-0012_2x40.nffw -> nic/nic_AMDA0058-0012_2x40.nffw
+Link: netronome/nic_AMDA0078-0011_1x100.nffw -> nic/nic_AMDA0078-0011_1x100.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
@ -3814,8 +3817,11 @@ File: netronome/nic/nic_AMDA0099-0001_1x10_1x25.nffw
				@@ -3814,8 +3817,11 @@ File: netronome/nic/nic_AMDA0099-0001_1x10_1x25.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
+File: netronome/nic/nic_AMDA0058-0011_2x40.nffw
+File: netronome/nic/nic_AMDA0058-0012_2x40.nffw
+File: netronome/nic/nic_AMDA0078-0011_1x100.nffw

-Version: v2.0.4
+Version: v2.0.7

 File: netronome/flower/nic_AMDA0099.nffw
 File: netronome/flower/nic_AMDA0096.nffw
--- a/netronome/nic/nic_AMDA0058-0011_2x40.nffw
+++ b/netronome/nic/nic_AMDA0058-0011_2x40.nffw
--- a/netronome/nic/nic_AMDA0058-0012_2x40.nffw
+++ b/netronome/nic/nic_AMDA0058-0012_2x40.nffw
--- a/netronome/nic/nic_AMDA0078-0011_1x100.nffw
+++ b/netronome/nic/nic_AMDA0078-0011_1x100.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_1x10_1x25.nffw
+++ b/netronome/nic/nic_AMDA0099-0001_1x10_1x25.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_AMDA0058-0011_2x40.nffw
+++ b/netronome/nic_AMDA0058-0011_2x40.nffw
@ -0,0 +1 @@
				@@ -0,0 +1 @@
+nic/nic_AMDA0058-0011_2x40.nffw
--- a/netronome/nic_AMDA0058-0012_2x40.nffw
+++ b/netronome/nic_AMDA0058-0012_2x40.nffw
@ -0,0 +1 @@
				@@ -0,0 +1 @@
+nic/nic_AMDA0058-0012_2x40.nffw
--- a/netronome/nic_AMDA0078-0011_1x100.nffw
+++ b/netronome/nic_AMDA0078-0011_1x100.nffw
@ -0,0 +1 @@
				@@ -0,0 +1 @@
+nic/nic_AMDA0078-0011_1x100.nffw
				`@ -0,0 +1 @@` @@ -0,0 +1 @@
				`nic/nic_AMDA0058-0011_2x40.nffw`
				`@ -0,0 +1 @@` @@ -0,0 +1 @@
				`nic/nic_AMDA0058-0012_2x40.nffw`
				`@ -0,0 +1 @@` @@ -0,0 +1 @@
				`nic/nic_AMDA0078-0011_1x100.nffw`