[Openocd-development] openocd patch: b311a1a cfi: fix gaffe in fixing warnings

[gerrit]

This is an automated email from Gerrit.

?yvind Harboe (oyvindhar...@gmail.com) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/162

-- gerrit

commit b311a1a7920d24b7436be3e390b8139700d3ba18
Author: Øyvind Harboe <oyvind.har...@zylin.com>
Date:   Thu Nov 3 21:43:31 2011 +0100

    cfi: fix gaffe in fixing warnings
    
    introduced reading garbage value for arm32.
    
    Change-Id: Ib5792a8a3207ee4db6d01d354df98c3cfabce037
    Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 62d2ae4..50531bb 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1897,15 +1897,12 @@ static int cfi_spansion_write_block(struct flash_bank 
*bank, uint8_t *buffer,
                armv4_5_info.common_magic = ARMV7M_COMMON_MAGIC;
                armv4_5_info.core_mode = ARMV7M_MODE_HANDLER;
                armv4_5_info.core_state = ARM_STATE_ARM;
-       } else if (armv4_5_info.common_magic == ARM_COMMON_MAGIC)
+       } else
        {
                /* All other ARM CPUs have 32 bit instructions */
                armv4_5_info.common_magic = ARM_COMMON_MAGIC;
                armv4_5_info.core_mode = ARM_MODE_SVC;
                armv4_5_info.core_state = ARM_STATE_ARM;
-       } else {
-               LOG_ERROR("Unknown ARM architecture");
-               return ERROR_FAIL;
        }
 
        int target_code_size = 0;

-- 

_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development