From 538ef055b7ea11326ba22197537e617587a0d677 Mon Sep 17 00:00:00 2001 From: Eric Joyner Date: Fri, 25 Jun 2021 10:20:24 -0700 Subject: 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 Reviewed by: stallamr_netapp.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D30887 --- sys/conf/files.amd64 | 6 +++--- sys/conf/files.arm64 | 6 +++--- sys/contrib/dev/ice/ice-1.3.19.0.pkg | Bin 614660 -> 0 bytes sys/contrib/dev/ice/ice-1.3.24.0.pkg | Bin 0 -> 622852 bytes sys/modules/ice_ddp/Makefile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 sys/contrib/dev/ice/ice-1.3.19.0.pkg create mode 100755 sys/contrib/dev/ice/ice-1.3.24.0.pkg diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 0a2e0f1d9f72..2bc68f6ac9b9 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -169,7 +169,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 \ @@ -178,8 +178,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 a1664cc9d299..94530ee4d3b0 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -222,7 +222,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 \ @@ -231,8 +231,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 index 32e2603bc131..000000000000 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 100755 index 000000000000..db2520cbe9aa 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 38337a106368..563655349bb8 100644 --- 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 -- cgit v1.2.3