git: e04c4b4a369d - main - ice_ddp: Update to 1.3.35.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Eric Joyner <erj_at_FreeBSD.org>
Date: Wed, 30 Aug 2023 19:44:43 UTC
The branch main has been updated by erj:

URL: https://cgit.FreeBSD.org/src/commit/?id=e04c4b4a369df3f1dcbebbdf726193f02af60801

commit e04c4b4a369df3f1dcbebbdf726193f02af60801
Author:     Eric Joyner <erj@FreeBSD.org>
AuthorDate: 2023-08-22 04:55:34 +0000
Commit:     Eric Joyner <erj@FreeBSD.org>
CommitDate: 2023-08-30 19:43:54 +0000

    ice_ddp: Update to 1.3.35.0
    
    This is intended to be used with the upcoming updated ice(4) version
    1.38.16-k.
    
    Signed-off-by: Eric Joyner <erj@FreeBSD.org>
    
    MFC after:      3 days
    Sponsored by:   Intel Corporation
---
 sys/conf/files.amd64                               |   6 +++---
 sys/conf/files.arm64                               |   6 +++---
 sys/conf/files.powerpc                             |   6 +++---
 sys/contrib/dev/ice/LICENSE                        |   2 +-
 .../dev/ice/{ice-1.3.30.0.pkg => ice-1.3.35.0.pkg} | Bin 692660 -> 692776 bytes
 sys/modules/ice_ddp/Makefile                       |   2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index e1499b19bb12..dfbe278f0c46 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -194,7 +194,7 @@ dev/ice/irdma_di_if.m		optional	ice pci \
 dev/ice/ice_ddp_common.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:0x01031e00 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
@@ -203,8 +203,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.30.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.30.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.35.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.35.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 7b033c979c55..02dcadc0aa5c 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -322,7 +322,7 @@ dev/ice/irdma_di_if.m				optional ice pci \
 dev/ice/ice_ddp_common.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:0x01031e00 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo					optional ice_ddp	\
@@ -331,8 +331,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.30.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.30.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.35.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index aad29d050b68..48251ab07d9e 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -95,7 +95,7 @@ dev/ice/irdma_di_if.m		optional	ice pci powerpc64 | ice pci powerpc64le \
 dev/ice/ice_ddp_common.c	optional	ice pci powerpc64 | ice pci powerpc64le \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c			optional	ice_ddp powerpc64 | ice pci powerpc64le \
-	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031e00 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local  \
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional	ice_ddp powerpc64 | ice pci powerpc64le \
@@ -104,8 +104,8 @@ ice_ddp.fwo			optional	ice_ddp powerpc64 | ice pci powerpc64le \
 	no-implicit-rule				\
 	clean		"ice_ddp.fwo"
 ice_ddp.fw			optional	ice_ddp powerpc64 | ice pci powerpc64le \
-	dependency	"$S/contrib/dev/ice/ice-1.3.30.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.30.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.35.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/ixl/if_ixl.c		optional	ixl pci powerpc64 \
diff --git a/sys/contrib/dev/ice/LICENSE b/sys/contrib/dev/ice/LICENSE
index 7faadfc55aac..97fe53c2d998 100644
--- a/sys/contrib/dev/ice/LICENSE
+++ b/sys/contrib/dev/ice/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2021, Intel Corporation.
+Copyright (c) 2006-2023, Intel Corporation.
 All rights reserved.
 
 Redistribution.  Redistribution and use in binary form, without
diff --git a/sys/contrib/dev/ice/ice-1.3.30.0.pkg b/sys/contrib/dev/ice/ice-1.3.35.0.pkg
similarity index 88%
rename from sys/contrib/dev/ice/ice-1.3.30.0.pkg
rename to sys/contrib/dev/ice/ice-1.3.35.0.pkg
index 454a2a6ea193..fc3e8ebc640f 100644
Binary files a/sys/contrib/dev/ice/ice-1.3.30.0.pkg and b/sys/contrib/dev/ice/ice-1.3.35.0.pkg differ
diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile
index 41ed4ac92888..ad85bc2a9935 100644
--- a/sys/modules/ice_ddp/Makefile
+++ b/sys/modules/ice_ddp/Makefile
@@ -1,5 +1,5 @@
 
 KMOD=	ice_ddp
-FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.30.0.pkg:ice_ddp:0x01031e00
+FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.35.0.pkg:ice_ddp:0x01032300
 
 .include <bsd.kmod.mk>