option byte support improved

stlink-org · Mar 11, 2021 · eff18d8 · eff18d8
1 parent cc9bedd
commit eff18d8
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/st-flash/flash_opts.c b/src/st-flash/flash_opts.c
@@ -337,12 +337,27 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
 
             if (ac == 2) {
                 uint32_t addr;
-                result = get_integer_from_char_array(av[1], &addr);
+                result = get_integer_from_char_array(av[0], &addr);
                 if (result != 0) {
                     return bad_arg ("addr");
                 } else {
                     o->addr = (stm32_addr_t) addr;
                 }
+                uint32_t val;
+                result = get_integer_from_char_array(av[1], &val);
+                if (result != 0) {
+                    return bad_arg ("val");
+                } else {
+                    o->val = (uint32_t) val;
+                }
+            } else {
+                uint32_t val;
+                result = get_integer_from_char_array(av[0], &val);
+                if (result != 0) {
+                    return bad_arg ("val");
+                } else {
+                    o->val = (uint32_t) val;
+                }
             }
         } else if (o->area == FLASH_OPTION_BYTES_BOOT_ADD) { // expect option bytes boot address
             if (ac != 1) { return invalid_args("option bytes boot_add write <value>"); }