ice_ddp: Update to 1.3.24.0

This version is intended to be used with the 0.29.4 version of the
ice(4) driver, which will be be committed afterwards.

Signed-off-by: Eric Joyner <erj@FreeBSD.org>
Reviewed by:	stallamr_netapp.com
Sponsored by:	Intel Corporation
Differential Revision:	https://reviews.freebsd.org/D30887

(cherry picked from commit 538ef055b7ea11326ba22197537e617587a0d677)
(cherry picked from commit 070f7812da16b692d4e65fdfd418654fdb42729d)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index d6b1f99820750704577a22051012e0cc1a1e4dda..ddc95b478ea4893d9934d7dbb0137960922fbe00 100644 (file)
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -206,7 +206,7 @@ dev/ice/ice_switch.c                optional        ice pci \
 dev/ice/ice_vlan_mode.c                optional        ice pci \
        compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c                      optional ice_ddp        \
-       compile-with    "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031300 -mice_ddp -c${.TARGET}"   \
+       compile-with    "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031800 -mice_ddp -c${.TARGET}"   \
        no-ctfconvert no-implicit-rule before-depend local      \
        clean           "ice_ddp.c"
 ice_ddp.fwo                    optional ice_ddp        \
@@ -215,8 +215,8 @@ ice_ddp.fwo                 optional ice_ddp        \
        no-implicit-rule                                \
        clean           "ice_ddp.fwo"
 ice_ddp.fw                     optional ice_ddp        \
-       dependency      "$S/contrib/dev/ice/ice-1.3.19.0.pkg" \
-       compile-with    "${CP} $S/contrib/dev/ice/ice-1.3.19.0.pkg ice_ddp.fw" \
+       dependency      "$S/contrib/dev/ice/ice-1.3.24.0.pkg" \
+       compile-with    "${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \
        no-obj no-implicit-rule                         \
        clean           "ice_ddp.fw"
 dev/ioat/ioat.c                        optional        ioat pci

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index df7eb81aeac5eaf52cd4c162dfc8c0758ac51e7f..c8b2f86a37941ecd44753fec8095c8e41aa0bd5f 100644 (file)
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -210,7 +210,7 @@ dev/ice/ice_switch.c                                optional ice pci \
 dev/ice/ice_vlan_mode.c                optional        ice pci \
        compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c                                      optional ice_ddp        \
-       compile-with    "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031300 -mice_ddp -c${.TARGET}"   \
+       compile-with    "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031800 -mice_ddp -c${.TARGET}"   \
        no-ctfconvert no-implicit-rule before-depend local      \
        clean           "ice_ddp.c"
 ice_ddp.fwo                                    optional ice_ddp        \
@@ -219,8 +219,8 @@ ice_ddp.fwo                                 optional ice_ddp        \
        no-implicit-rule                                \
        clean           "ice_ddp.fwo"
 ice_ddp.fw                                     optional ice_ddp        \
-       dependency      "$S/contrib/dev/ice/ice-1.3.19.0.pkg" \
-       compile-with    "${CP} $S/contrib/dev/ice/ice-1.3.19.0.pkg ice_ddp.fw" \
+       dependency      "$S/contrib/dev/ice/ice-1.3.24.0.pkg" \
+       compile-with    "${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \
        no-obj no-implicit-rule                         \
        clean           "ice_ddp.fw"
 

diff --git a/sys/contrib/dev/ice/ice-1.3.19.0.pkg b/sys/contrib/dev/ice/ice-1.3.19.0.pkg
deleted file mode 100644 (file)
index 32e2603..0000000
Binary files a/sys/contrib/dev/ice/ice-1.3.19.0.pkg and /dev/null differ

diff --git a/sys/contrib/dev/ice/ice-1.3.24.0.pkg b/sys/contrib/dev/ice/ice-1.3.24.0.pkg
new file mode 100644 (file)
index 0000000..db2520c
Binary files /dev/null and b/sys/contrib/dev/ice/ice-1.3.24.0.pkg differ

diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile
index 38337a1063686c31261bccd0e36ff88ac045783a..563655349bb8389960492412cb88e9dc433dce64 100644 (file)
--- a/sys/modules/ice_ddp/Makefile
+++ b/sys/modules/ice_ddp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=  ice_ddp
-FIRMWS=        ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.19.0.pkg:ice_ddp:0x01031300
+FIRMWS=        ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.24.0.pkg:ice_ddp:0x01031800
 
 .include <bsd.kmod.mk>