Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Apr 2024 22:15:01 GMT
From:      Eric Joyner <erj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: eafd6c26f95e - stable/14 - ice_ddp: Update package to 1.3.36.0
Message-ID:  <202404242215.43OMF1E4071400@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by erj:

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

commit eafd6c26f95eff33c03bfb20fc3f2b2666cd6988
Author:     Eric Joyner <erj@FreeBSD.org>
AuthorDate: 2024-02-13 06:39:21 +0000
Commit:     Eric Joyner <erj@FreeBSD.org>
CommitDate: 2024-04-24 22:14:48 +0000

    ice_ddp: Update package to 1.3.36.0
    
    This is intended to be used with the upcoming ice 1.39.13-k
    driver update, but is still backwards compatible with
    previous versions of the driver.
    
    Signed-off-by: Eric Joyner <erj@FreeBSD.org>
    
    Sponsored by:   Intel Corporation
    
    (cherry picked from commit 768329961dc0c041f7647f1c4549944a2ca168aa)
---
 sys/conf/files.amd64                               |   6 +++---
 sys/conf/files.arm64                               |   6 +++---
 sys/conf/files.powerpc                             |   6 +++---
 .../dev/ice/{ice-1.3.35.0.pkg => ice-1.3.36.0.pkg} | Bin 692776 -> 692776 bytes
 sys/modules/ice_ddp/Makefile                       |   2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 5ef285b70c55..8a5e643913a3 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -196,7 +196,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:0x01032300 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
@@ -205,8 +205,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.35.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.36.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.36.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 218571d0e23a..fd59014ad461 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:0x01032300 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -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.35.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.36.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.36.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 0293efd28fbe..1a0388884ee8 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:0x01032300 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -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.35.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.36.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.36.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/ice-1.3.35.0.pkg b/sys/contrib/dev/ice/ice-1.3.36.0.pkg
similarity index 98%
rename from sys/contrib/dev/ice/ice-1.3.35.0.pkg
rename to sys/contrib/dev/ice/ice-1.3.36.0.pkg
index fc3e8ebc640f..ce5dbf41f557 100644
Binary files a/sys/contrib/dev/ice/ice-1.3.35.0.pkg and b/sys/contrib/dev/ice/ice-1.3.36.0.pkg differ
diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile
index ad85bc2a9935..7329f0897325 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.35.0.pkg:ice_ddp:0x01032300
+FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.36.0.pkg:ice_ddp:0x01032400
 
 .include <bsd.kmod.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404242215.43OMF1E4071400>