diff --git a/mstflint-4.10.0-loongarch.patch b/mstflint-4.10.0-loongarch.patch new file mode 100644 index 0000000000000000000000000000000000000000..d488ed28d77b418e2015eb5b10056b3cbcd744f6 --- /dev/null +++ b/mstflint-4.10.0-loongarch.patch @@ -0,0 +1,72 @@ +diff -Naur aa/common/compatibility.h bb/common/compatibility.h +--- aa/common/compatibility.h 2023-01-04 10:30:00.957104162 +0800 ++++ bb/common/compatibility.h 2023-01-04 10:33:48.736423701 +0800 +@@ -40,7 +40,7 @@ + + #include + +-#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__) || defined(__sw_64__) ++#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__) || defined(__sw_64__) || defined(__loongarch__) + #define U64L "l" + #else + #define U64L "ll" +@@ -65,6 +65,8 @@ + # define ARCH_arm6l + # elif defined(__sw_64__) + # define ARCH_sw_64 ++# elif defined(__loongarch__) ++# define ARCH_loongarch + # else + # error Unknown CPU architecture using the linux OS + # endif +@@ -111,7 +113,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) || defined(ARCH_sw_64) ++#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_sw_64) || defined(ARCH_loongarch) + # define U64D_FMT "%lu" + # define U64H_FMT "0x%016lx" + # define U48H_FMT "0x%012lx" +diff -Naur aa/mtcr_ul/packets_common.h bb/mtcr_ul/packets_common.h +--- aa/mtcr_ul/packets_common.h 2023-01-04 10:30:00.961104220 +0800 ++++ bb/mtcr_ul/packets_common.h 2023-01-04 10:37:32.375682905 +0800 +@@ -154,6 +154,8 @@ + # define ARCH_arm6l + # elif defined(__sw_64__) + # define ARCH_sw_64 ++# elif defined(__loongarch__) ++# define ARCH_loongarch + # else + # error Unknown CPU architecture using the linux OS + # endif +@@ -175,7 +177,7 @@ + # define U8H_FMT "0x%02x" + # define U32D_FMT "%u" + # define STR_FMT "%s" +- #elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) ++ #elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_loongarch) + # define U64H_FMT "0x%016llx" + # define U64D_FMT "%llu" + # define U32H_FMT "0x%08x" +diff -Naur aa/tools_layouts/adb_to_c_utils.h bb/tools_layouts/adb_to_c_utils.h +--- aa/tools_layouts/adb_to_c_utils.h 2023-01-04 10:30:00.969104337 +0800 ++++ bb/tools_layouts/adb_to_c_utils.h 2023-01-04 10:38:21.364396841 +0800 +@@ -139,6 +139,8 @@ + # define ARCH_arm6l + # elif defined(__sw_64__) + # define ARCH_sw_64 ++# elif defined(__loongarch__) ++# define ARCH_loongarch + # else + # error Unknown CPU architecture using the linux OS + # endif +@@ -182,7 +184,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) || defined(ARCH_sw_64) ++#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_sw_64) || defined(ARCH_loongarch) + # define U64D_FMT "%lu" + # define U64H_FMT "0x%016lx" + # define U48H_FMT "0x%012lx" diff --git a/mstflint-4.10.0-sw.patch b/mstflint-4.10.0-sw.patch old mode 100755 new mode 100644 diff --git a/mstflint.spec b/mstflint.spec index a6a9f4307eaaf01bfe0db93829fd0035a50e9a9c..be64dcccb0812d361467afbb64fa69cd7e824711 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -1,7 +1,7 @@ Name: mstflint Summary: Firmware Burning and Diagnostics Tools Version: 4.10.0 -Release: 9 +Release: 10 License: GPLv2+ or BSD Url: https://github.com/Mellanox/mstflint Source: https://github.com/Mellanox/%{name}/releases/download/v4.10.0-2/%{name}-%{version}.tar.gz @@ -9,6 +9,7 @@ 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: mstflint-4.10.0-loongarch.patch BuildRequires: libstdc++-devel zlib-devel rdma-core-devel gcc-c++ gcc BuildRequires: libcurl-devel boost-devel libxml2-devel openssl-devel @@ -46,6 +47,9 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{_mandir}/man1/* %changelog +* Wed Jan 04 2023 yaoxin - 4.10.0-10 +- Add loongarch architecture + * Thu Dec 29 2022 chenmaodong - 4.10.0-9 - Fix error while burning mcc enabled Description