git: 2d9d209fdbbe - stable/12 - ice_ddp: Update to 1.3.24.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 19 Oct 2022 23:23:35 UTC
The branch stable/12 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d9d209fdbbe0c4b2db770f17cec2178321decdf commit 2d9d209fdbbe0c4b2db770f17cec2178321decdf Author: Eric Joyner <erj@FreeBSD.org> AuthorDate: 2021-06-25 17:20:24 +0000 Commit: Eric Joyner <erj@FreeBSD.org> CommitDate: 2022-10-19 21:47:15 +0000 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) --- sys/conf/files.amd64 | 6 +++--- sys/conf/files.arm64 | 8 ++++---- .../dev/ice/{ice-1.3.19.0.pkg => ice-1.3.24.0.pkg} | Bin 614660 -> 622852 bytes sys/modules/ice_ddp/Makefile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 879c25f10c27..88f84ee88a8e 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -290,7 +290,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 \ @@ -299,8 +299,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 1eaf553973e5..aa4d7fda5bf1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -261,17 +261,17 @@ 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 \ +ice_ddp.fwo optional ice_ddp \ dependency "ice_ddp.fw" \ compile-with "${NORMAL_FWO}" \ 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/iicbus/sy8106a.c optional sy8106a fdt diff --git a/sys/contrib/dev/ice/ice-1.3.19.0.pkg b/sys/contrib/dev/ice/ice-1.3.24.0.pkg similarity index 82% rename from sys/contrib/dev/ice/ice-1.3.19.0.pkg rename to sys/contrib/dev/ice/ice-1.3.24.0.pkg index 32e2603bc131..db2520cbe9aa 100644 Binary files a/sys/contrib/dev/ice/ice-1.3.19.0.pkg 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 <bsd.kmod.mk>