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

29 files changed, 33 insertions, 3 deletions

diff --git a/LICENCE.Netronome b/LICENCE.Netronome
index c2712e4a..1ed7a7c5 100644
--- 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
diff --git a/WHENCE b/WHENCE
index a251cf6c..e9852f6b 100644
--- a/WHENCE
+++ b/WHENCE
@@ -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
-
-Version: v0.6.1
+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: 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
 
diff --git a/netronome/flower/nic_AMDA0081-0001_1x40.nffw b/netronome/flower/nic_AMDA0081-0001_1x40.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0081-0001_1x40.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0081-0001_4x10.nffw b/netronome/flower/nic_AMDA0081-0001_4x10.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0081-0001_4x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0096-0001_2x10.nffw b/netronome/flower/nic_AMDA0096-0001_2x10.nffw
new file mode 120000
index 00000000..334d828b
--- /dev/null
+++ b/netronome/flower/nic_AMDA0096-0001_2x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0096.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0096.nffw b/netronome/flower/nic_AMDA0096.nffw
new file mode 100644
index 00000000..43d6dc29
--- /dev/null
+++ b/netronome/flower/nic_AMDA0096.nffw
diff --git a/netronome/flower/nic_AMDA0097-0001_2x40.nffw b/netronome/flower/nic_AMDA0097-0001_2x40.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097-0001_2x40.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0097-0001_8x10.nffw b/netronome/flower/nic_AMDA0097-0001_8x10.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097-0001_8x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0097.nffw b/netronome/flower/nic_AMDA0097.nffw
new file mode 100644
index 00000000..9b585b87
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097.nffw
diff --git a/netronome/flower/nic_AMDA0099-0001_2x10.nffw b/netronome/flower/nic_AMDA0099-0001_2x10.nffw
new file mode 120000
index 00000000..b2cd0803
--- /dev/null
+++ b/netronome/flower/nic_AMDA0099-0001_2x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0099.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0099-0001_2x25.nffw b/netronome/flower/nic_AMDA0099-0001_2x25.nffw
new file mode 120000
index 00000000..b2cd0803
--- /dev/null
+++ b/netronome/flower/nic_AMDA0099-0001_2x25.nffw
@@ -0,0 +1 @@
+nic_AMDA0099.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0099.nffw b/netronome/flower/nic_AMDA0099.nffw
new file mode 100644
index 00000000..fbc52ed0
--- /dev/null
+++ b/netronome/flower/nic_AMDA0099.nffw
diff --git a/netronome/nic/nic_AMDA0081-0001_1x40.nffw b/netronome/nic/nic_AMDA0081-0001_1x40.nffw
new file mode 100644
index 00000000..138820dc
--- /dev/null
+++ b/netronome/nic/nic_AMDA0081-0001_1x40.nffw
diff --git a/netronome/nic/nic_AMDA0081-0001_4x10.nffw b/netronome/nic/nic_AMDA0081-0001_4x10.nffw
new file mode 100644
index 00000000..59b3735c
--- /dev/null
+++ b/netronome/nic/nic_AMDA0081-0001_4x10.nffw
diff --git a/netronome/nic/nic_AMDA0096-0001_2x10.nffw b/netronome/nic/nic_AMDA0096-0001_2x10.nffw
new file mode 100644
index 00000000..6e1a51a8
--- /dev/null
+++ b/netronome/nic/nic_AMDA0096-0001_2x10.nffw
diff --git a/netronome/nic/nic_AMDA0097-0001_2x40.nffw b/netronome/nic/nic_AMDA0097-0001_2x40.nffw
new file mode 100644
index 00000000..74178cea
--- /dev/null
+++ b/netronome/nic/nic_AMDA0097-0001_2x40.nffw
diff --git a/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
new file mode 100644
index 00000000..c060415c
--- /dev/null
+++ b/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
diff --git a/netronome/nic/nic_AMDA0097-0001_8x10.nffw b/netronome/nic/nic_AMDA0097-0001_8x10.nffw
new file mode 100644
index 00000000..d19b564e
--- /dev/null
+++ b/netronome/nic/nic_AMDA0097-0001_8x10.nffw
diff --git a/netronome/nic/nic_AMDA0099-0001_2x10.nffw b/netronome/nic/nic_AMDA0099-0001_2x10.nffw
new file mode 100644
index 00000000..a83d153b
--- /dev/null
+++ b/netronome/nic/nic_AMDA0099-0001_2x10.nffw
diff --git a/netronome/nic/nic_AMDA0099-0001_2x25.nffw b/netronome/nic/nic_AMDA0099-0001_2x25.nffw
new file mode 100644
index 00000000..6c3c0736
--- /dev/null
+++ b/netronome/nic/nic_AMDA0099-0001_2x25.nffw
diff --git a/netronome/nic_AMDA0081-0001_1x40.nffw b/netronome/nic_AMDA0081-0001_1x40.nffw
index cb70a45d..29f855eb 100644..120000
--- a/netronome/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/nic_AMDA0081-0001_1x40.nffw
diff --git a/netronome/nic_AMDA0081-0001_4x10.nffw b/netronome/nic_AMDA0081-0001_4x10.nffw
index f935d519..aac204c8 100644..120000
--- a/netronome/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/nic_AMDA0081-0001_4x10.nffw
diff --git a/netronome/nic_AMDA0096-0001_2x10.nffw b/netronome/nic_AMDA0096-0001_2x10.nffw
index 8f40cea5..64ace8cd 100644..120000
--- a/netronome/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/nic_AMDA0096-0001_2x10.nffw
diff --git a/netronome/nic_AMDA0097-0001_2x40.nffw b/netronome/nic_AMDA0097-0001_2x40.nffw
index 42b4111a..206a46da 100644..120000
--- a/netronome/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/nic_AMDA0097-0001_2x40.nffw
diff --git a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
index aeb77a11..29df1eee 100644..120000
--- a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
diff --git a/netronome/nic_AMDA0097-0001_8x10.nffw b/netronome/nic_AMDA0097-0001_8x10.nffw
index 969bf940..382dcbc1 100644..120000
--- a/netronome/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/nic_AMDA0097-0001_8x10.nffw
diff --git a/netronome/nic_AMDA0099-0001_2x10.nffw b/netronome/nic_AMDA0099-0001_2x10.nffw
index 2cbfc230..cbb4b47f 100644..120000
--- a/netronome/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/nic_AMDA0099-0001_2x10.nffw
diff --git a/netronome/nic_AMDA0099-0001_2x25.nffw b/netronome/nic_AMDA0099-0001_2x25.nffw
index 821e3e98..a1af5a5f 100644..120000
--- a/netronome/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic_AMDA0099-0001_2x25.nffw