This is an automated email from Gerrit.

Christopher Head ([email protected]) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/4745

-- gerrit

commit 566fca5be1cffe2d26048b8be6ed33b10f27d73f
Author: Christopher Head <[email protected]>
Date:   Tue Oct 30 14:45:11 2018 -0700

    flash/stm32h7x: include IO_HSLV in user3_options
    
    Bit 29 of OPTSR is IO_HSLV. It ought to be read in stm32x_read_options
    and written in stm32x_write_options. Adjust the bitmasks to do this.
    
    Change-Id: I785a5291c991c98b774177f960dc58f2b5e045e2
    Signed-off-by: Christopher Head <[email protected]>

diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index fcfcf91..d336bc3 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -325,7 +325,7 @@ static int stm32x_read_options(struct flash_bank *bank)
        stm32x_info->option_bytes.user_options = optiondata & 0xfc;
        stm32x_info->option_bytes.RDP = (optiondata >> 8) & 0xff;
        stm32x_info->option_bytes.user2_options = (optiondata >> 16) & 0xff;
-       stm32x_info->option_bytes.user3_options = (optiondata >> 24) & 0x83;
+       stm32x_info->option_bytes.user3_options = (optiondata >> 24) & 0xa3;
 
        if (optiondata & IWDG1_HW)
                stm32x_info->option_bytes.independent_watchdog_selection = 1;
@@ -366,7 +366,7 @@ static int stm32x_write_options(struct flash_bank *bank)
        optiondata = stm32x_info->option_bytes.user_options;
        optiondata |= (stm32x_info->option_bytes.RDP << 8);
        optiondata |= (stm32x_info->option_bytes.user2_options & 0xff) << 16;
-       optiondata |= (stm32x_info->option_bytes.user3_options & 0x83) << 24;
+       optiondata |= (stm32x_info->option_bytes.user3_options & 0xa3) << 24;
 
        if (stm32x_info->option_bytes.independent_watchdog_selection)
                optiondata |= IWDG1_HW;

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to