!35 提交riscv支持补丁

From: @laokz 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li

0005-Allow-building-on-riscv64.patch

@@ -0,0 +1,80 @@
+From 889235fee41dc9b565407ce923e5af100c839b97 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <nvidia@cohens.org.il>
+Date: Fri, 5 Feb 2021 10:36:33 +0200
+Subject: [PATCH] Allow building on riscv64
+
+---
+ common/compatibility.h         | 4 +++-
+ mtcr_ul/packets_common.h       | 4 +++-
+ tools_layouts/adb_to_c_utils.h | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/common/compatibility.h b/common/compatibility.h
+index f8bc817..d163478 100644
+--- a/common/compatibility.h
++++ b/common/compatibility.h
+@@ -63,6 +63,8 @@
+ #       define ARCH_arm64
+ #   elif defined(__arm__)
+ #       define ARCH_arm6l
++#   elif defined(__riscv)
++#       define ARCH_riscv
+ #   else
+ #       error Unknown CPU architecture using the linux OS
+ #   endif
+@@ -109,7 +111,7 @@
+ #       define U48H_FMT     "0x%012llx"
+ #       define U64D_FMT_GEN "llu"
+ #   endif
+-#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
++#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
+ #    define U64D_FMT     "%lu"
+ #    define U64H_FMT     "0x%016lx"
+ #    define U48H_FMT     "0x%012lx"
+diff --git a/mtcr_ul/packets_common.h b/mtcr_ul/packets_common.h
+index 4df05ef..7f43b59 100644
+--- a/mtcr_ul/packets_common.h
++++ b/mtcr_ul/packets_common.h
+@@ -152,6 +152,8 @@
+ #       define ARCH_arm64
+ #   elif defined(__arm__)
+ #       define ARCH_arm6l
++#   elif defined(__riscv)
++#       define ARCH_riscv
+ #   else
+ #       error Unknown CPU architecture using the linux OS
+ #   endif
+@@ -165,7 +167,7 @@
+ /* define macros for print fields */
+ //#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)
+ /*
+- #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__))
++ #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_riscv))
+  #   define U64H_FMT "0x%016lx"
+  #   define U64D_FMT "%lu"
+  #   define U32H_FMT "0x%08x"
+diff --git a/tools_layouts/adb_to_c_utils.h b/tools_layouts/adb_to_c_utils.h
+index 2e7a1ef..61af52f 100644
+--- a/tools_layouts/adb_to_c_utils.h
++++ b/tools_layouts/adb_to_c_utils.h
+@@ -140,6 +140,8 @@ extern "C" {
+ #       define ARCH_arm64
+ #   elif defined(__arm__)
+ #       define ARCH_arm6l
++#   elif defined(__riscv)
++#       define ARCH_riscv
+ #   else
+ #       error Unknown CPU architecture using the linux OS
+ #   endif
+@@ -183,7 +185,7 @@ extern "C" {
+ #       define U64H_FMT    "0x%016llx"
+ #       define U48H_FMT    "0x%012llx"
+ #   endif
+-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
++#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
+ #    define U64D_FMT    "%lu"
+ #    define U64H_FMT    "0x%016lx"
+ #	 define U48H_FMT	"0x%012lx" 
+-- 
+2.40.1
+

backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch

@@ -0,0 +1,33 @@
+From e8d9ff786a04eb142ce6f3c8650ea975bbe595e2 Mon Sep 17 00:00:00 2001
+From: Samer Deeb <samerd@mellanox.com>
+Date: Mon, 12 Nov 2018 20:39:36 +0000
+Subject: [PATCH] Title: Fix error while burning mcc enabled Description:
+ ignore HMAC calculation Issue: 1472385
+
+Signed-off-by: Samer Deeb <samerd@mellanox.com>
+---
+ mlxfwops/lib/fs3_ops.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
+index deb4a05..b5a9d93 100644
+--- a/mlxfwops/lib/fs3_ops.cpp
++++ b/mlxfwops/lib/fs3_ops.cpp
+@@ -3316,12 +3316,12 @@ bool Fs3Operations::AddHMACIfNeeded(Fs3Operations* imageOps, Flash *f)
+         }
+     }
+ 
+-    return true;
+ #else
+     (void)imageOps;
+     (void)f;
+-    return errmsg("HMAC calculation is not implemented\n");
++    //ignore
+ #endif
++    return true;
+ }
+ 
+ bool Fs3Operations::DoAfterBurnJobs(const u_int32_t magic_patter[],
+-- 
+2.21.0
+

mstflint-4.10.0-sw.patch

@@ -0,0 +1,63 @@
+diff -Naur mstflint-4.10.0.org/common/compatibility.h mstflint-4.10.0.sw/common/compatibility.h
+--- mstflint-4.10.0.org/common/compatibility.h	2022-05-27 11:07:58.390000000 +0000
++++ mstflint-4.10.0.sw/common/compatibility.h	2022-05-27 11:20:13.920000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include <stdio.h>
+ 
+-#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__)
++#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__) || defined(__sw_64__)
+     #define U64L       "l"
+ #else
+     #define U64L       "ll"
+@@ -63,6 +63,8 @@
+ #       define ARCH_arm64
+ #   elif defined(__arm__)
+ #       define ARCH_arm6l
++#   elif defined(__sw_64__)
++#       define ARCH_sw_64
+ #   else
+ #       error Unknown CPU architecture using the linux OS
+ #   endif
+@@ -109,7 +111,7 @@
+ #       define U48H_FMT     "0x%012llx"
+ #       define U64D_FMT_GEN "llu"
+ #   endif
+-#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
++#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_sw_64)
+ #    define U64D_FMT     "%lu"
+ #    define U64H_FMT     "0x%016lx"
+ #    define U48H_FMT     "0x%012lx"
+diff -Naur mstflint-4.10.0.org/mtcr_ul/packets_common.h mstflint-4.10.0.sw/mtcr_ul/packets_common.h
+--- mstflint-4.10.0.org/mtcr_ul/packets_common.h	2022-05-27 11:07:58.400000000 +0000
++++ mstflint-4.10.0.sw/mtcr_ul/packets_common.h	2022-05-27 11:10:09.880000000 +0000
+@@ -152,6 +152,8 @@
+ #       define ARCH_arm64
+ #   elif defined(__arm__)
+ #       define ARCH_arm6l
++#   elif defined(__sw_64__)
++#       define ARCH_sw_64
+ #   else
+ #       error Unknown CPU architecture using the linux OS
+ #   endif
+diff -Naur mstflint-4.10.0.org/tools_layouts/adb_to_c_utils.h mstflint-4.10.0.sw/tools_layouts/adb_to_c_utils.h
+--- mstflint-4.10.0.org/tools_layouts/adb_to_c_utils.h	2022-05-27 11:07:58.500000000 +0000
++++ mstflint-4.10.0.sw/tools_layouts/adb_to_c_utils.h	2022-05-27 11:09:31.900000000 +0000
+@@ -137,6 +137,8 @@
+ #       define ARCH_arm64
+ #   elif defined(__arm__)
+ #       define ARCH_arm6l
++#   elif defined(__sw_64__)
++#       define ARCH_sw_64
+ #   else
+ #       error Unknown CPU architecture using the linux OS
+ #   endif
+@@ -180,7 +182,7 @@
+ #       define U64H_FMT    "0x%016llx"
+ #       define U48H_FMT    "0x%012llx"
+ #   endif
+-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
++#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_sw_64)
+ #    define U64D_FMT    "%lu"
+ #    define U64H_FMT    "0x%016lx"
+ #	 define U48H_FMT	"0x%012lx" 

mstflint.spec

@@ -1,12 +1,16 @@
 Name:           mstflint
 Summary:        Firmware Burning and Diagnostics Tools
 Version:        4.10.0
-Release:        8
+Release:        13
 License:        GPLv2+ or BSD
 Url:            https://github.com/Mellanox/mstflint
 Source:         https://github.com/Mellanox/%{name}/releases/download/v4.10.0-1/%{name}-%{version}.tar.gz
 Patch0000:      0001-Fix-compile-errors.patch
 Patch0001:      fix-return-local-addr.patch
+Patch0002:      mstflint-4.10.0-sw.patch
+Patch0003:      backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch
+Patch0004:      backport-0001-Title-Fix-errors-found-with-checkpatch-script.patch
+Patch0005:      0005-Allow-building-on-riscv64.patch
 
 BuildRequires:  libstdc++-devel zlib-devel rdma-core-devel gcc-c++ gcc
 BuildRequires:  libcurl-devel boost-devel libxml2-devel openssl-devel
@@ -20,7 +24,15 @@ code. Please see the file LICENSE for licensing details.
 %package_help
 
 %prep
-%autosetup -p1
+%setup
+%patch0 -p1
+%patch1 -p1
+%ifarch sw_64
+%patch2 -p1
+%endif
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -30,6 +42,7 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %install
 %make_install
 
+strip %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
 %delete_la_and_a
 
 %files
@@ -44,6 +57,21 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jun 28 2023 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 4.10.0-13
+- Add riscv64 patch from v4.17
+
+* Fri Jan 06 2023 chenmaodong <chenmaodong@xfusion.com> - 4.10.0-12
+- Fix errors found with checkpatch script
+
+* Thu Jan 05 2023 chenmaodong <chenmaodong@xfusion.com> - 4.10.0-11
+- Fix error while burning mcc enabled Description
+
+* Thu Dec 8 2022 liyanan <liyanan32@h-partners.com>  - 4.10.0-10
+- fix strip problem
+
+* Tue Nov 29 2022 wuzx<wuzx1226@qq.com> - 4.10.0-9
+- Add sw64 architecture
+
 * Thu Nov 10 2022 liyanan <liyanan32@h-partners.com>  - 4.10.0-8
 - Change source