The branch stable/13 has been updated by erj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9c1fafce1ed3f005763862852e03762bcf9b9785
commit 9c1fafce1ed3f005763862852e03762bcf9b9785
Author: Eric Joyner <e...@freebsd.org>
AuthorDate: 2023-08-22 04:55:34 +0000
Commit: Eric Joyner <e...@freebsd.org>
CommitDate: 2024-07-31 03:48:56 +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 <e...@freebsd.org>
Sponsored by: Intel Corporation
(cherry picked from commit e04c4b4a369df3f1dcbebbdf726193f02af60801)
---
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 245b6a29b585..7180f4e0e83d 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -207,7 +207,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 \
@@ -216,8 +216,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 bb593a8f9a01..286cbc0ae566 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -238,7 +238,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 \
@@ -247,8 +247,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 2db6e15b70f5..3bb98c15d15c 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -82,7 +82,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 \
@@ -91,8 +91,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>
