[Pkg-ofed-commits] [mstflint] 21/25: Refresh all patches
Benjamin Drung
bdrung at moszumanska.debian.org
Tue Jan 3 11:58:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository mstflint.
commit ee7c8d8af7b214a6da3e06fc3f14542adc6c0727
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date: Mon Jan 2 16:40:09 2017 +0100
Refresh all patches
---
debian/patches/0002-Fix-typo-allign-align.patch | 153 ++++++++++++++-------
.../patches/0003-Fix-typo-missmatch-mismatch.patch | 68 +++------
debian/patches/0004-Fix-other-typos.patch | 45 +++---
.../Fix-compilation-on-unknown-architectures.patch | 6 +-
debian/patches/disable-werror.patch | 2 +-
5 files changed, 152 insertions(+), 122 deletions(-)
diff --git a/debian/patches/0002-Fix-typo-allign-align.patch b/debian/patches/0002-Fix-typo-allign-align.patch
index 4a1e7a1..30b9c1e 100644
--- a/debian/patches/0002-Fix-typo-allign-align.patch
+++ b/debian/patches/0002-Fix-typo-allign-align.patch
@@ -16,11 +16,9 @@ Subject: Fix typo allign -> align
tools_layouts/tools_open_layouts.h | 2 +-
10 files changed, 30 insertions(+), 30 deletions(-)
-diff --git a/mflash/mflash.c b/mflash/mflash.c
-index 299441c..987d95f 100644
--- a/mflash/mflash.c
+++ b/mflash/mflash.c
-@@ -938,7 +938,7 @@ int read_chunks (mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data) {
+@@ -946,7 +946,7 @@
//
// First and last cycles (can be the same one) may not be block aligned.
@@ -29,7 +27,7 @@ index 299441c..987d95f 100644
// (there's an option to write partial buffer, but Intel reference code always
// writes full buffer, with pads if needed. I do the dame ...)
//
-@@ -1478,7 +1478,7 @@ int cntx_st_spi_block_read_ex (mflash* mfl, u_int32_t blk_addr, u_int32_t blk_s
+@@ -1486,7 +1486,7 @@
u_int32_t gw_addr = 0;
//printf("-D- cntx_st_spi_block_read_ex(addr=%05x, u_int32_t size=%03x, first=%d, last=%d)\n", blk_addr, blk_size, (u_int32_t) is_first, (u_int32_t) is_last);
@@ -38,7 +36,7 @@ index 299441c..987d95f 100644
if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4) {
return MFE_BAD_PARAMS;
-@@ -1528,7 +1528,7 @@ int cntx_st_spi_block_read_old (mflash* mfl, u_int32_t blk_addr, u_int32_t blk_
+@@ -1536,7 +1536,7 @@
u_int32_t gw_cmd = 0;
u_int32_t gw_addr = 0;
@@ -47,7 +45,7 @@ index 299441c..987d95f 100644
if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4) {
return MFE_BAD_PARAMS;
-@@ -1566,7 +1566,7 @@ int cntx_st_spi_page_write (mflash* mfl, u_int32_t addr, u_int32_t size, u_in
+@@ -1574,7 +1574,7 @@
u_int8_t is_last = 0;
u_int8_t* p = data;
@@ -56,7 +54,7 @@ index 299441c..987d95f 100644
last_addr = addr + size;
last_blk_addr = last_addr - mfl->attr.block_write;
-@@ -1592,7 +1592,7 @@ int cntx_sst_spi_byte_write (mflash* mfl, u_int32_t addr, u_int32_t size, u_i
+@@ -1600,7 +1600,7 @@
u_int32_t last_addr;
u_int8_t* p = data;
@@ -65,11 +63,9 @@ index 299441c..987d95f 100644
last_addr = addr + size;
-diff --git a/mflash/mflash_access_layer.c b/mflash/mflash_access_layer.c
-index f5e6836..cec8241 100755
--- a/mflash/mflash_access_layer.c
+++ b/mflash/mflash_access_layer.c
-@@ -105,7 +105,7 @@ int sx_block_read_by_type(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u
+@@ -121,7 +121,7 @@
return MFE_BAD_PARAMS;
}
rc = mfl_get_bank_info(mfl, blk_addr, &flash_offset, &bank); CHECK_RC(rc);
@@ -78,7 +74,7 @@ index f5e6836..cec8241 100755
rc = check_access_type( mfl); CHECK_RC(rc);
rc = sx_st_block_access(mfl->mf, flash_offset, bank, blk_size, data, REG_ACCESS_METHOD_GET);CHECK_RC(rc);
-@@ -118,11 +118,11 @@ int sx_block_write_by_type(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t
+@@ -134,11 +134,11 @@
int rc, bank;
u_int32_t flash_offset;
@@ -92,11 +88,9 @@ index f5e6836..cec8241 100755
rc = check_access_type( mfl); CHECK_RC(rc);
rc = sx_st_block_access(mfl->mf, flash_offset, bank, size, data, REG_ACCESS_METHOD_SET);CHECK_RC(rc);
-diff --git a/mflash/mflash_pack_layer.h b/mflash/mflash_pack_layer.h
-index f36859c..3866781 100755
--- a/mflash/mflash_pack_layer.h
+++ b/mflash/mflash_pack_layer.h
-@@ -171,7 +171,7 @@ enum AccessTypeByMfile{
+@@ -204,7 +204,7 @@
#endif
*/
@@ -105,7 +99,7 @@ index f36859c..3866781 100755
if (addr & ((u_int32_t)block_write - 1)) {\
return MFE_BAD_ALIGN;\
}\
-@@ -180,7 +180,7 @@ enum AccessTypeByMfile{
+@@ -213,7 +213,7 @@
}\
}
@@ -114,11 +108,9 @@ index f36859c..3866781 100755
if (flash_addr & (size - 1 )) {\
return MFE_BAD_ALIGN;\
}\
-diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
-index db5b9ec..4fa3923 100755
--- a/mlxfwops/lib/flint_io.cpp
+++ b/mlxfwops/lib/flint_io.cpp
-@@ -521,7 +521,7 @@ bool Flash::write (u_int32_t addr,
+@@ -597,7 +597,7 @@
Aligner align(first_set);
align.Init (addr, cnt);
while (align.GetNextChunk(chunk_addr, chunk_size)) {
@@ -127,11 +119,9 @@ index db5b9ec..4fa3923 100755
int rc;
if (!noerase) {
-diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
-index 0f65f2b..3e83a47 100644
--- a/mlxfwops/lib/fs3_ops.cpp
+++ b/mlxfwops/lib/fs3_ops.cpp
-@@ -1713,7 +1713,7 @@ bool Fs3Operations::Fs3UpdateVpdSection(struct toc_info *curr_toc, char *vpd,
+@@ -1704,7 +1704,7 @@
}
if (vpd_size % 4) {
delete[] vpd_data;
@@ -140,11 +130,9 @@ index 0f65f2b..3e83a47 100644
}
// assuming VPD section is the last piece of Data on the flash
if ( (_ioAccess)->is_flash() && (getAbsAddr(curr_toc) + vpd_size > (_ioAccess)->get_size())) {
-diff --git a/mtcr_ul/mtcr_ib_ofed.c b/mtcr_ul/mtcr_ib_ofed.c
-index 971d4b8..3ba1b89 100644
--- a/mtcr_ul/mtcr_ib_ofed.c
+++ b/mtcr_ul/mtcr_ib_ofed.c
-@@ -782,7 +782,7 @@ mib_close(mfile *mf)
+@@ -782,7 +782,7 @@
return 0;
}
@@ -153,7 +141,7 @@ index 971d4b8..3ba1b89 100644
if (length % 4) { \
IBERROR(("Size must be 4 aligned, got %d", length));\
return -1; \
-@@ -857,7 +857,7 @@ MTCR_API int mib_readblock(mfile *mf, unsigned int offset, u_int32_t *data, int
+@@ -857,7 +857,7 @@
}
ibvs_mad* h = (ibvs_mad*)(mf->ctx);
@@ -162,7 +150,7 @@ index 971d4b8..3ba1b89 100644
if (ibvsmad_craccess_rw(h, offset, IB_MAD_METHOD_GET, (length / 4), data) == ~0ull) {
IBERROR(("cr access read to %s failed", h->portid2str(&h->portid)));
-@@ -874,7 +874,7 @@ MTCR_API int mib_writeblock(mfile *mf, unsigned int offset, u_int32_t *data, int
+@@ -874,7 +874,7 @@
}
ibvs_mad* h = (ibvs_mad*)(mf->ctx);
@@ -171,11 +159,9 @@ index 971d4b8..3ba1b89 100644
if (ibvsmad_craccess_rw(h, offset, IB_MAD_METHOD_SET, (length / 4), data) == ~0ull) {
IBERROR(("cr access read to %s failed", h->portid2str(&h->portid)));
-diff --git a/mtcr_ul/mtcr_tools_cif.c b/mtcr_ul/mtcr_tools_cif.c
-index 926054f..176454a 100644
--- a/mtcr_ul/mtcr_tools_cif.c
+++ b/mtcr_ul/mtcr_tools_cif.c
-@@ -301,7 +301,7 @@ int tools_cmdif_send_inline_cmd(mfile* mf,
+@@ -301,7 +301,7 @@
// read from mailbox method. output[2] is in BigEndian
static int tools_cmdif_mbox_read(mfile* mf, u_int32_t offset, u_int32_t output[2])
{
@@ -184,7 +170,7 @@ index 926054f..176454a 100644
return ME_BAD_PARAMS;
}
tools_cmdif cmdif;
-@@ -324,7 +324,7 @@ static int tools_cmdif_mbox_read(mfile* mf, u_int32_t offset, u_int32_t output[2
+@@ -324,7 +324,7 @@
// write to mailbox method. input[2] is in BigEndian
static int tools_cmdif_mbox_write(mfile* mf, u_int32_t offset, u_int32_t input[2])
{
@@ -193,7 +179,7 @@ index 926054f..176454a 100644
return ME_BAD_PARAMS;
}
tools_cmdif cmdif;
-@@ -411,7 +411,7 @@ cleanup_no_sem:
+@@ -411,7 +411,7 @@
return val == MAGIC ? ME_OK : ME_CMDIF_NOT_SUPP;
}
@@ -202,7 +188,7 @@ index 926054f..176454a 100644
((byte_sz) + ((8 - ((byte_sz) & 7) == 8) ? 0 : (8 - ((byte_sz) & 7))))
int tools_cmdif_send_mbox_command_int(mfile* mf,
-@@ -425,16 +425,16 @@ int tools_cmdif_send_mbox_command_int(mfile* mf,
+@@ -425,16 +425,16 @@
int skip_write,
int use_cr_mbox)
{
@@ -224,7 +210,7 @@ index 926054f..176454a 100644
return ME_BAD_PARAMS;
}
mpci_change(mf);
-@@ -486,12 +486,12 @@ int tools_cmdif_send_mbox_command_int(mfile* mf,
+@@ -486,12 +486,12 @@
// read read_data_size bytes from mbox and update our data
if (use_cr_mbox == 1) {
// read mailbox from virtual CR-space
@@ -239,11 +225,9 @@ index 926054f..176454a 100644
rc = tools_cmdif_mbox_read(mf, i/4, (u_int32_t*)&(mailbox[i]));
if (rc) {
goto cleanup;
-diff --git a/tools_layouts/register_access_open_layouts.c b/tools_layouts/register_access_open_layouts.c
-index c6d2e8f..a5a49fc 100644
--- a/tools_layouts/register_access_open_layouts.c
+++ b/tools_layouts/register_access_open_layouts.c
-@@ -167,7 +167,7 @@ void register_access_mfpa_pack(const struct register_access_mfpa *ptr_struct, u_
+@@ -167,7 +167,7 @@
adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
offset = 200;
@@ -252,7 +236,7 @@ index c6d2e8f..a5a49fc 100644
offset = 224;
adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->capability_mask);
-@@ -208,7 +208,7 @@ void register_access_mfpa_unpack(struct register_access_mfpa *ptr_struct, const
+@@ -208,7 +208,7 @@
ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
offset = 200;
@@ -261,7 +245,7 @@ index c6d2e8f..a5a49fc 100644
offset = 224;
ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-@@ -250,7 +250,7 @@ void register_access_mfpa_print(const struct register_access_mfpa *ptr_struct, F
+@@ -250,7 +250,7 @@
fprintf(file, "sector_size : "UH_FMT"\n", ptr_struct->sector_size);
adb2c_add_indentation(file, indent_level);
@@ -270,11 +254,9 @@ index c6d2e8f..a5a49fc 100644
adb2c_add_indentation(file, indent_level);
fprintf(file, "capability_mask : "U32H_FMT"\n", ptr_struct->capability_mask);
-diff --git a/tools_layouts/register_access_open_layouts.h b/tools_layouts/register_access_open_layouts.h
-index e455493..374f2f4 100644
--- a/tools_layouts/register_access_open_layouts.h
+++ b/tools_layouts/register_access_open_layouts.h
-@@ -102,7 +102,7 @@ struct register_access_mfpa {
+@@ -102,7 +102,7 @@
u_int16_t sector_size;
/* Description - */
/* 24.16 - 24.23 */
@@ -283,19 +265,92 @@ index e455493..374f2f4 100644
/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
/* Description - capability mask ;bit 0:Parallel flash Support;else:Reserved */
/* 28.0 - 32.31 */
-diff --git a/tools_layouts/tools_open_layouts.h b/tools_layouts/tools_open_layouts.h
-index 318db63..f99abe4 100644
--- a/tools_layouts/tools_open_layouts.h
+++ b/tools_layouts/tools_open_layouts.h
-@@ -281,7 +281,7 @@ struct tools_open_nv_hdr {
+@@ -282,7 +282,7 @@
/* Description - Shadow: i.e if set the Fw will not update the tlv immediately but wait for a command */
- /* 4.24 - 4.24 */
+ /* 0x4.24 - 0x4.24 */
u_int8_t shadow;
- /* Description - Pad count: for non dword alligned tlvs */
+ /* Description - Pad count: for non dword aligned tlvs */
- /* 4.25 - 4.26 */
+ /* 0x4.25 - 0x4.26 */
u_int8_t pad_cnt;
/* Description - Data version can be set by caller or left as 0. */
---
-2.7.4
-
+@@ -455,7 +455,7 @@
+ u_int16_t sector_size;
+ /* Description - */
+ /* 0x18.16 - 0x18.23 */
+- u_int8_t block_allignment;
++ u_int8_t block_alignment;
+ /* Description - */
+ /* 0x18.24 - 0x18.31 */
+ u_int8_t block_size;
+--- a/tools_layouts/connectib_layouts.c
++++ b/tools_layouts/connectib_layouts.c
+@@ -6578,7 +6578,7 @@
+ adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
+
+ offset=200;
+- adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
++ adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_alignment);
+
+ offset=192;
+ adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
+@@ -6620,7 +6620,7 @@
+ ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+
+ offset=200;
+- ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
++ ptr_struct->block_alignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+
+ offset=192;
+ ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+@@ -6660,7 +6660,7 @@
+ fprintf(file, "sector_size : "UH_FMT"\n", ptr_struct->sector_size);
+
+ adb2c_add_indentation(file, indent_level);
+- fprintf(file, "block_allignment : "UH_FMT"\n", ptr_struct->block_allignment);
++ fprintf(file, "block_alignment : "UH_FMT"\n", ptr_struct->block_alignment);
+
+ adb2c_add_indentation(file, indent_level);
+ fprintf(file, "block_size : "UH_FMT"\n", ptr_struct->block_size);
+--- a/tools_layouts/connectib_layouts.h
++++ b/tools_layouts/connectib_layouts.h
+@@ -1844,7 +1844,7 @@
+ u_int16_t sector_size;
+ /* Description - */
+ /* 24.16 - 24.23 */
+- u_int8_t block_allignment;
++ u_int8_t block_alignment;
+ /* Description - */
+ /* 24.24 - 28.31 */
+ u_int8_t block_size;
+--- a/tools_layouts/tools_open_layouts.c
++++ b/tools_layouts/tools_open_layouts.c
+@@ -1401,7 +1401,7 @@
+ adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
+
+ offset = 200;
+- adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
++ adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_alignment);
+
+ offset = 192;
+ adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
+@@ -1454,7 +1454,7 @@
+ ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+
+ offset = 200;
+- ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
++ ptr_struct->block_alignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+
+ offset = 192;
+ ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+@@ -1508,7 +1508,7 @@
+ fprintf(file, "sector_size : " UH_FMT "\n", ptr_struct->sector_size);
+
+ adb2c_add_indentation(file, indent_level);
+- fprintf(file, "block_allignment : " UH_FMT "\n", ptr_struct->block_allignment);
++ fprintf(file, "block_alignment : " UH_FMT "\n", ptr_struct->block_alignment);
+
+ adb2c_add_indentation(file, indent_level);
+ fprintf(file, "block_size : " UH_FMT "\n", ptr_struct->block_size);
diff --git a/debian/patches/0003-Fix-typo-missmatch-mismatch.patch b/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
index a2f11a9..5f70495 100644
--- a/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
+++ b/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
@@ -15,11 +15,9 @@ Subject: Fix typo missmatch -> mismatch
mlxfwops/lib/mlxfwops_com.h | 8 ++++----
9 files changed, 23 insertions(+), 23 deletions(-)
-diff --git a/flint/err_msgs.h b/flint/err_msgs.h
-index 6f8bc18..8ce5f0e 100644
--- a/flint/err_msgs.h
+++ b/flint/err_msgs.h
-@@ -131,7 +131,7 @@ typedef enum {
+@@ -131,7 +131,7 @@
#define FLINT_NO_GUID_MAC_FLAGS_ERROR "Can not set GUIDs/MACs: please run with -uid/-guid/-mac flag.\n"
#define FLINT_NO_UID_FLAG_ERROR "Can not set GUIDs/MACs: uid is not specified, please run with -uid flag.\n"
#define FLINT_CHECKSUM_ERROR "Failed to calculate checksum on %s: %s\n"
@@ -28,11 +26,9 @@ index 6f8bc18..8ce5f0e 100644
#define FLINT_CHECKSUM_PARSE_ERROR "Failed to parse given checksum.\n"
#define FLINT_CHECKSUM_LEN_ERROR "MD5 checksum should be exactly 16 bytes long.\n"
#define FLINT_CHECKSUM_HEX_ERROR "MD5 checksum should contain only hexadecimal digits.\n"
-diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
-index 71a9fbd..84b237f 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
-@@ -1377,7 +1377,7 @@ FlintStatus BurnSubCommand::burnFs2()
+@@ -1381,7 +1381,7 @@
// Warn if a fw which does not support config is burnt over fw that does support config
// The other way (new fw with config, old fw w/o config) is a normal update flow.
@@ -41,11 +37,9 @@ index 71a9fbd..84b237f 100644
// Verify config offset. Should never be different between image and flash (unless changing PSID).
-diff --git a/mlxfwops/lib/aux_tlv_ops.cpp b/mlxfwops/lib/aux_tlv_ops.cpp
-index a580c78..f3f8280 100644
--- a/mlxfwops/lib/aux_tlv_ops.cpp
+++ b/mlxfwops/lib/aux_tlv_ops.cpp
-@@ -339,7 +339,7 @@ Tlv_Status_t ImageTlvOps::parseTlvs()
+@@ -339,7 +339,7 @@
if (tlv.hdr.header_type == 0x0) { // only know how to deal with header of type 0x0
// check CRC and store
if (tlv.hdr.crc != calcTlvCrc(tlv)) {
@@ -54,11 +48,9 @@ index a580c78..f3f8280 100644
}
// store it
_tlvVec.push_back(tlv);
-diff --git a/mlxfwops/lib/aux_tlv_ops.h b/mlxfwops/lib/aux_tlv_ops.h
-index e139d20..dde60b1 100644
--- a/mlxfwops/lib/aux_tlv_ops.h
+++ b/mlxfwops/lib/aux_tlv_ops.h
-@@ -46,7 +46,7 @@ typedef enum {
+@@ -46,7 +46,7 @@
TS_OLD_TIMESTAMP,
TS_UNSUPPORTED_ICMD_VERSION,
// image related errors,
@@ -67,11 +59,9 @@ index e139d20..dde60b1 100644
TS_TLV_PARSE_ERROR,
TS_NO_TLV_SECTION_FOUND,
TS_FAILED_TO_OPEN_FILE,
-diff --git a/mlxfwops/lib/fs2_ops.cpp b/mlxfwops/lib/fs2_ops.cpp
-index 7268ee3..2a686c6 100644
--- a/mlxfwops/lib/fs2_ops.cpp
+++ b/mlxfwops/lib/fs2_ops.cpp
-@@ -930,7 +930,7 @@ bool Fs2Operations::Fs2FailSafeBurn(Fs2Operations &imageOps,
+@@ -927,7 +927,7 @@
}
if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize) {
@@ -80,7 +70,7 @@ index 7268ee3..2a686c6 100644
1 << _fwImgInfo.cntxLog2ChunkSize,
1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
}
-@@ -1404,11 +1404,11 @@ bool Fs2Operations::Fs2Burn(Fs2Operations &imageOps, ExtBurnParams& burnParams)
+@@ -1416,11 +1416,11 @@
_ioAccess->get_rev_id(),
imageOps._fwImgInfo.supportedHwId,
imageOps._fwImgInfo.supportedHwIdNum)) {
@@ -94,11 +84,9 @@ index 7268ee3..2a686c6 100644
}
}
-diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
-index 3e83a47..bf63474 100644
--- a/mlxfwops/lib/fs3_ops.cpp
+++ b/mlxfwops/lib/fs3_ops.cpp
-@@ -704,7 +704,7 @@ bool Fs3Operations::UpdateDevDataITOC(Fs3Operations &imageOps, struct toc_info *
+@@ -704,7 +704,7 @@
if ( (flash_toc_entry->device_data != image_toc_entry->device_data) || \
(flash_toc_entry->no_crc != image_toc_entry->no_crc) || \
(flash_toc_entry->relative_addr != image_toc_entry->relative_addr)) {
@@ -107,7 +95,7 @@ index 3e83a47..bf63474 100644
GetSectionNameByType(image_toc_entry->type), GET_DIFFER_STR(flash_toc_entry, image_toc_entry));
}
// replace itoc entry in the image
-@@ -927,10 +927,10 @@ bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
+@@ -927,10 +927,10 @@
_ioAccess->get_rev_id(),
imageOps._fwImgInfo.supportedHwId,
imageOps._fwImgInfo.supportedHwIdNum)) {
@@ -120,20 +108,7 @@ index 3e83a47..bf63474 100644
}
}
-@@ -975,10 +975,10 @@ bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
- if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize) {
- //TODO: remove both cond before release
- if (_ioAccess->get_size() < 0x1000000) {
-- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Image intended for 16MB Flash. please replace your HCA or perform rework before updating.");
-+ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Image intended for 16MB Flash. please replace your HCA or perform rework before updating.");
- }
- // if (imageOps._fwImgInfo.cntxLog2ChunkSize == 0x16 ) {
-- return errmsg(MLXFW_FS_INFO_MISSMATCH_ERR, "Device and Image chunk sizes differ\n"
-+ return errmsg(MLXFW_FS_INFO_MISMATCH_ERR, "Device and Image chunk sizes differ\n"
- " Internal users: in order to fix, please run: mlxfwup -d %s -f %d.%04d.%04d --fix_cx4_image\n"
- " External users: contact Mellanox support team.", _devName, imageOps._fwImgInfo.ext_info.fw_ver[0],
- imageOps._fwImgInfo.ext_info.fw_ver[1], imageOps._fwImgInfo.ext_info.fw_ver[2]);
-@@ -2465,7 +2465,7 @@ bool Fs3Operations::TestAndSetTimeStamp(Fs3Operations &imageOps)
+@@ -2456,7 +2456,7 @@
// versions match allow update
retRc = true;
} else {
@@ -142,11 +117,9 @@ index 3e83a47..bf63474 100644
devFwVer.fw_ver_minor,\
devFwVer.fw_ver_subminor,\
imageOps._fwImgInfo.ext_info.fw_ver[0],\
-diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
-index 34a8fc7..e4220b7 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
-@@ -1010,7 +1010,7 @@ bool FwOperations::HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char *hw_name
+@@ -982,7 +982,7 @@
// This function gets the HW ID of the target device and the dev ID from
// the image. It then matches the 2 IDs and returns an error in case of
@@ -155,7 +128,7 @@ index 34a8fc7..e4220b7 100644
// dev id, and a single hw dev id may match multiple SW dev IDs.
//
bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_int32_t* supportedHwId, u_int32_t supportedHwIdNum) {
-@@ -1059,7 +1059,7 @@ bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_i
+@@ -1031,7 +1031,7 @@
return false;
}
@@ -164,7 +137,7 @@ index 34a8fc7..e4220b7 100644
curr_hw_id_name, supp_hw_id_list);
}
bool FwOperations::CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId) {
-@@ -1113,7 +1113,7 @@ bool FwOperations::CheckPSID(FwOperations &imageOps, u_int8_t allow_psid_change)
+@@ -1085,7 +1085,7 @@
{
if (!allow_psid_change) {
if (strncmp( _fwImgInfo.ext_info.psid, imageOps._fwImgInfo.ext_info.psid, PSID_LEN)) {
@@ -173,11 +146,9 @@ index 34a8fc7..e4220b7 100644
imageOps._fwImgInfo.ext_info.psid, _fwImgInfo.ext_info.psid);
}
}
-diff --git a/mlxfwops/lib/mlxfwops.cpp b/mlxfwops/lib/mlxfwops.cpp
-index 681076a..4e387a3 100755
--- a/mlxfwops/lib/mlxfwops.cpp
+++ b/mlxfwops/lib/mlxfwops.cpp
-@@ -105,7 +105,7 @@ MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err)
+@@ -105,7 +105,7 @@
return "Memory allocation Error";
case MLXFW_ERR_IN_STR:
return "Error in String";
@@ -186,7 +157,7 @@ index 681076a..4e387a3 100755
return "PSID Mismatch";
case MLXFW_FLASH_WRITE_ERR:
return "Flash write Failed";
-@@ -127,11 +127,11 @@ MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err)
+@@ -127,11 +127,11 @@
return "Image too large";
case MLXFW_IMAGE_FORMAT_ERR:
return "Incompatible image format";
@@ -200,11 +171,9 @@ index 681076a..4e387a3 100755
return "Failsafe information mismatch";
case MLXFW_DEV_ID_ERR:
return "Unsupported device ID";
-diff --git a/mlxfwops/lib/mlxfwops_com.h b/mlxfwops/lib/mlxfwops_com.h
-index 0935904..578764c 100644
--- a/mlxfwops/lib/mlxfwops_com.h
+++ b/mlxfwops/lib/mlxfwops_com.h
-@@ -94,7 +94,7 @@ enum {
+@@ -94,7 +94,7 @@
MLXFW_ERR,
MLXFW_MEM_ERR,
MLXFW_ERR_IN_STR,
@@ -213,7 +182,7 @@ index 0935904..578764c 100644
MLXFW_FLASH_WRITE_ERR,
MLXFW_NO_VALID_IMAGE_ERR,
MLXFW_MULTIPLE_VALID_IMAGES_ERR,
-@@ -105,9 +105,9 @@ enum {
+@@ -105,9 +105,9 @@
MLXFW_IMAGE_NOT_FS_ERR,
MLXFW_IMAGE_TOO_LARGE_ERR,
MLXFW_IMAGE_FORMAT_ERR,
@@ -225,7 +194,7 @@ index 0935904..578764c 100644
MLXFW_DEV_ID_ERR,
MLXFW_UNSUPPORTED_BIN_VER_ERR,
MLXFW_NO_VALID_ITOC_ERR,
-@@ -120,7 +120,7 @@ enum {
+@@ -120,7 +120,7 @@
MLXFW_GET_SECT_ERR,
MLXFW_UPDATE_SECT_ERR,
MLXFW_BAD_PARAM_ERR,
@@ -234,6 +203,3 @@ index 0935904..578764c 100644
MLXFW_NO_VALID_DEVICE_INFO_ERR,
MLXFW_TWO_VALID_DEVICE_INFO_ERR,
MLXFW_DTOC_OVERWRITE_CHUNK
---
-2.7.4
-
diff --git a/debian/patches/0004-Fix-other-typos.patch b/debian/patches/0004-Fix-other-typos.patch
index 83bb5f4..2b990d8 100644
--- a/debian/patches/0004-Fix-other-typos.patch
+++ b/debian/patches/0004-Fix-other-typos.patch
@@ -11,11 +11,9 @@ Subject: Fix other typos
small_utils/mtserver.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
-index 84b237f..dd0532e 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
-@@ -647,7 +647,7 @@ bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWOR
+@@ -650,7 +650,7 @@
int i;
if (!stdinHndl) {
@@ -24,22 +22,18 @@ index 84b237f..dd0532e 100644
stdinHndl = GetStdHandle(STD_INPUT_HANDLE);
}
printf("%s:", preStr);
-diff --git a/man/mstmcra.1 b/man/mstmcra.1
-index d7a72e2..102597c 100644
--- a/man/mstmcra.1
+++ b/man/mstmcra.1
-@@ -30,5 +30,5 @@ mstmcra [-s <i2c-slave>] [-a <adb dump>] [-v] [-h] <device>
+@@ -30,5 +30,5 @@
.IP
.SH Environment Vairables:
.TP
-ADB_DUMP : Holds the path to adb dump, used for access by path (can be overriden by "\-a").
+ADB_DUMP : Holds the path to adb dump, used for access by path (can be overridden by "\-a").
.TP
-diff --git a/man/mstmtserver.1 b/man/mstmtserver.1
-index bccd186..885bf49 100644
--- a/man/mstmtserver.1
+++ b/man/mstmtserver.1
-@@ -10,7 +10,7 @@ mstmtserver [options]
+@@ -10,7 +10,7 @@
.TP
\fB-p\fR[ort] <port> - Listen to specify port (default is 23108).
.TP
@@ -48,11 +42,9 @@ index bccd186..885bf49 100644
.TP
\fB-h\fR[elp] - Print help message.
.TP
-diff --git a/small_utils/mcra.c b/small_utils/mcra.c
-index 9cdf872..dd18b2c 100644
--- a/small_utils/mcra.c
+++ b/small_utils/mcra.c
-@@ -76,7 +76,7 @@ void usage(const char *n, int with_exit)
+@@ -76,7 +76,7 @@
printf(" -v : Display version info\n");
printf("\n");
printf("Environment Variables:\n");
@@ -61,11 +53,9 @@ index 9cdf872..dd18b2c 100644
if (with_exit) {
exit(1);
}
-diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
-index 4436058..5ad1776 100644
--- a/small_utils/mtserver.c
+++ b/small_utils/mtserver.c
-@@ -325,7 +325,7 @@ void usage(const char *s)
+@@ -325,7 +325,7 @@
printf("Usage:\n\t%s [switches]\n\n", s);
printf("Switches may be:\n");
printf("\t-p[ort] <port> - Listen to specify port (default is %d).\n", port);
@@ -74,6 +64,25 @@ index 4436058..5ad1776 100644
printf("%s", sim_str);
printf("\t-h[elp] - Print help message.\n");
exit (1);
---
-2.7.4
-
+--- a/mlxconfig/mlxcfg_parser.cpp
++++ b/mlxconfig/mlxcfg_parser.cpp
+@@ -99,7 +99,7 @@
+ printf("\n");
+ printf(IDENT"COMMANDS:\n");
+ printf(IDENT2"%-24s : %s\n","clear_semaphore", "clear the tool semaphore.");
+- printf(IDENT2"%-24s : %s\n","i[show_confs]", "display informations about all configurations.");
++ printf(IDENT2"%-24s : %s\n","i[show_confs]", "display information about all configurations.");
+ printf(IDENT2"%-24s : %s\n","q[uery]", "query current supported configurations.");
+ printf(IDENT2"%-24s : %s\n","r[eset]", "reset all configurations to their default value.");
+ printf(IDENT2"%-24s : %s\n","s[et]", "set configurations to a specific device.");
+--- a/mlxfwops/lib/flint_io.cpp
++++ b/mlxfwops/lib/flint_io.cpp
+@@ -295,7 +295,7 @@
+ bool FImage::write(u_int32_t addr, void* data, int cnt)
+ {
+ if ( !_isFile ) {
+- return errmsg("Cannot perfrom write to file. no file specified.");
++ return errmsg("Cannot perform write to file. no file specified.");
+ }
+
+ if (!readWriteCommCheck(addr, 0)) {
diff --git a/debian/patches/Fix-compilation-on-unknown-architectures.patch b/debian/patches/Fix-compilation-on-unknown-architectures.patch
index c69fa34..073fd3e 100644
--- a/debian/patches/Fix-compilation-on-unknown-architectures.patch
+++ b/debian/patches/Fix-compilation-on-unknown-architectures.patch
@@ -66,10 +66,10 @@ Author: Benjamin Drung <benjamin.drung at profitbricks.com>
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD)
# if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
- # define U64D_FMT "0x%"PRId64
+ # define U64D_FMT "0x%" PRId64
--- a/mtcr_ul/packets_common.h
+++ b/mtcr_ul/packets_common.h
-@@ -132,56 +132,6 @@
+@@ -135,56 +135,6 @@
#endif
@@ -175,4 +175,4 @@ Author: Benjamin Drung <benjamin.drung at profitbricks.com>
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD)
# if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
- # define U64D_FMT "0x%"PRId64
+ # define U64D_FMT "0x%" PRId64
diff --git a/debian/patches/disable-werror.patch b/debian/patches/disable-werror.patch
index 1c59eb3..49bcef0 100644
--- a/debian/patches/disable-werror.patch
+++ b/debian/patches/disable-werror.patch
@@ -22,7 +22,7 @@ Author: Benjamin Drung <benjamin.drung at profitbricks.com>
--- a/configure.ac
+++ b/configure.ac
-@@ -77,8 +77,8 @@
+@@ -98,8 +98,8 @@
LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/mstflint.git
More information about the Pkg-ofed-commits
mailing list