git: 52323cdab724 - stable/12 - ice_ddp: Update package file to 1.3.19.0

[Eric Joyner]

The branch stable/12 has been updated by erj:

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

commit 52323cdab7242ae651357bb51b9658e2b5193795
Author:     Eric Joyner <erj at FreeBSD.org>
AuthorDate: 2021-02-23 01:43:54 +0000
Commit:     Eric Joyner <erj at FreeBSD.org>
CommitDate: 2021-09-20 22:08:16 +0000

    ice_ddp: Update package file to 1.3.19.0
    
    This package is intended to be used with ice(4) version 0.28.1-k.
    That update will happen in a forthcoming commit.
    
    Signed-off-by: Eric Joyner <erj at FreeBSD.org>
    Sponsored by: Intel Corporation
    (cherry picked from commit a7ac518bff64d48cf262c60c4dc57eef34e74a07)
---
 sys/conf/files.amd64                               |   8 ++++----
 sys/conf/files.arm64                               |  12 ++++++------
 sys/contrib/dev/ice/LICENSE                        |   2 +-
 .../dev/ice/{ice-1.3.16.0.pkg => ice-1.3.19.0.pkg} | Bin 659716 -> 614660 bytes
 sys/modules/ice_ddp/Makefile                       |   2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index c49728bff1aa..abcf387a10eb 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -288,8 +288,8 @@ dev/ice/ice_sriov.c		optional	ice pci \
 dev/ice/ice_switch.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:0x01031000 -mice_ddp -c${.TARGET}"	\
-	no-implicit-rule before-depend local		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031300 -mice_ddp -c${.TARGET}"	\
+	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
 	dependency	"ice_ddp.fw"			\
@@ -297,8 +297,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.16.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \
+	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" \
 	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 ea1fdaf59e8c..d082b032fe69 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -258,18 +258,18 @@ dev/ice/ice_sriov.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_switch.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:0x01031000 -mice_ddp -c${.TARGET}"	\
-	no-implicit-rule before-depend local		\
+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}"	\
+	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 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.16.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \
+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" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/iicbus/sy8106a.c		optional	sy8106a fdt
diff --git a/sys/contrib/dev/ice/LICENSE b/sys/contrib/dev/ice/LICENSE
index 7daf627fc7a0..7faadfc55aac 100644
--- a/sys/contrib/dev/ice/LICENSE
+++ b/sys/contrib/dev/ice/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2018, Intel Corporation.
+Copyright (c) 2006-2021, Intel Corporation.
 All rights reserved.
 
 Redistribution.  Redistribution and use in binary form, without
diff --git a/sys/contrib/dev/ice/ice-1.3.16.0.pkg b/sys/contrib/dev/ice/ice-1.3.19.0.pkg
similarity index 79%
rename from sys/contrib/dev/ice/ice-1.3.16.0.pkg
rename to sys/contrib/dev/ice/ice-1.3.19.0.pkg
index ec5caecb3a72..32e2603bc131 100644
Binary files a/sys/contrib/dev/ice/ice-1.3.16.0.pkg and b/sys/contrib/dev/ice/ice-1.3.19.0.pkg differ
diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile
index e6f45ae3820b..38337a106368 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.16.0.pkg:ice_ddp:0x01031000
+FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.19.0.pkg:ice_ddp:0x01031300
 
 .include <bsd.kmod.mk>