The branch main has been updated by erj:

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

commit 768329961dc0c041f7647f1c4549944a2ca168aa
Author:     Eric Joyner <[email protected]>
AuthorDate: 2024-02-13 06:39:21 +0000
Commit:     Eric Joyner <[email protected]>
CommitDate: 2024-02-21 05:13:18 +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 <[email protected]>
    
    MFC after:      3 days
    Sponsored by:   Intel Corporation
---
 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 cb5ed560a82e..09478599efc5 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 dcdd429c14c4..625684a91534 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -327,7 +327,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        \
@@ -336,8 +336,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>

Reply via email to