flash/stm32h7x: remove IWDG1_SW separate variable

[openocd.git] / src / flash / nor / stm32h7x.c

diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index ad76af4adff1ae0e08b959675bbcbbecf57e9227..d21e9fa5e558888f43259b3577e09c91e539c25e 100644 (file)
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -78,9 +78,6 @@
 #define OPT_LOCK       (1 << 0)
 #define OPT_START      (1 << 1)
 
 #define OPT_LOCK       (1 << 0)
 #define OPT_START      (1 << 1)
 

-/* FLASH_OPTCUR bit definitions (reading) */
-#define IWDG1_HW       (1 << 4)
-

 /* register unlock keys */
 #define KEY1           0x45670123
 #define KEY2           0xCDEF89AB
 /* register unlock keys */
 #define KEY1           0x45670123
 #define KEY2           0xCDEF89AB


@@ -109,7 +106,6 @@ struct stm32x_options {
        uint8_t user_options;
        uint8_t user2_options;
        uint8_t user3_options;
        uint8_t user_options;
        uint8_t user2_options;
        uint8_t user3_options;

-       uint8_t independent_watchdog_selection;

 };
 
 struct stm32h7x_part_info {
 };
 
 struct stm32h7x_part_info {


@@ -327,11 +323,6 @@ static int stm32x_read_options(struct flash_bank *bank)
        stm32x_info->option_bytes.user2_options = (optiondata >> 16) & 0xff;
        stm32x_info->option_bytes.user3_options = (optiondata >> 24) & 0x83;
 
        stm32x_info->option_bytes.user2_options = (optiondata >> 16) & 0xff;
        stm32x_info->option_bytes.user3_options = (optiondata >> 24) & 0x83;
 

-       if (optiondata & IWDG1_HW)
-               stm32x_info->option_bytes.independent_watchdog_selection = 1;
-       else
-               stm32x_info->option_bytes.independent_watchdog_selection = 0;
-

        if (stm32x_info->option_bytes.RDP != 0xAA)
                LOG_INFO("Device Security Bit Set");
 
        if (stm32x_info->option_bytes.RDP != 0xAA)
                LOG_INFO("Device Security Bit Set");
 


@@ -368,11 +359,6 @@ static int stm32x_write_options(struct flash_bank *bank)
        optiondata |= (stm32x_info->option_bytes.user2_options & 0xff) << 16;
        optiondata |= (stm32x_info->option_bytes.user3_options & 0x83) << 24;
 
        optiondata |= (stm32x_info->option_bytes.user2_options & 0xff) << 16;
        optiondata |= (stm32x_info->option_bytes.user3_options & 0x83) << 24;
 

-       if (stm32x_info->option_bytes.independent_watchdog_selection)
-               optiondata |= IWDG1_HW;
-       else
-               optiondata &= ~IWDG1_HW;
-

        /* program options */
        retval = target_write_u32(target, FLASH_REG_BASE_B0 + FLASH_OPTPRG, optiondata);
                if (retval != ERROR_OK)
        /* program options */
        retval = target_write_u32(target, FLASH_REG_BASE_B0 + FLASH_OPTPRG, optiondata);
                if (retval != ERROR_OK)