[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1249-g17789d376

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  17789d3762aff931bc4bffd2c129100d952ccc84 (commit)
       via  ac870d80a9232fda1588c2784f157e6f8863f4b7 (commit)
      from  763f2549ad4f9d3d59c472f79b4f9b37abb276ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 17789d3762aff931bc4bffd2c129100d952ccc84
Author: Marc Schink <de...@za...>
Date:   Mon May 4 16:56:14 2020 +0200

    flash/nor/sh_qspi: Fix dead assignment
    
    Change-Id: I6a99076fea30062535e615244895698e51107441
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: http://openocd.zylin.com/5645
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/sh_qspi.c b/src/flash/nor/sh_qspi.c
index 931b0b176..862e43aae 100644
--- a/src/flash/nor/sh_qspi.c
+++ b/src/flash/nor/sh_qspi.c
@@ -654,7 +654,7 @@ static int sh_qspi_read(struct flash_bank *bank, uint8_t *buffer,
 	destroy_reg_param(&reg_params[2]);
 	destroy_reg_param(&reg_params[3]);
 
-	return ERROR_OK;
+	return ret;
 }
 
 /* Return ID of flash device */

commit ac870d80a9232fda1588c2784f157e6f8863f4b7
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Tue May 12 21:00:18 2020 +0100

    arm_disassembler: fix typo 'ARM_UNKNOWN_INSTUCTION' to '.._INSTRUCTION'
    
    Change-Id: I3a3d566fe96fb1497cf8337389e993e0f728a64b
    Signed-off-by: Laurent LEMELE <lau...@st...>
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5657
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 55aaddd0a..da8aee28b 100644
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -2086,7 +2086,7 @@ static int evaluate_b_bl_blx_thumb(uint16_t opcode,
 			break;
 		/* BL/BLX prefix */
 		case 2:
-			instruction->type = ARM_UNKNOWN_INSTUCTION;
+			instruction->type = ARM_UNKNOWN_INSTRUCTION;
 			mnemonic = "prefix";
 			target_address = offset << 12;
 			break;
diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index e9f4d44cb..486e903e3 100644
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -20,7 +20,7 @@
 #define OPENOCD_TARGET_ARM_DISASSEMBLER_H
 
 enum arm_instruction_type {
-	ARM_UNKNOWN_INSTUCTION,
+	ARM_UNKNOWN_INSTRUCTION,
 
 	/* Branch instructions */
 	ARM_B,

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/sh_qspi.c       | 2 +-
 src/target/arm_disassembler.c | 2 +-
 src/target/arm_disassembler.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository