[nrf fromtree] scripts: runners: nrf: Implement the erase command

The `erase` command was being used but there was no "backend"
implementation for it in nrfutil nor nrfjprog. Simplify the syntax and
implement it for both tools.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit dc7d8bb)

Author: carlescufi

scripts/west_commands/runners/nrf_common.py

@@ -390,8 +390,7 @@ def program_hex(self):
                         )
 
             if not self.erase and generated_uicr:
-                self.exec_op('erase', core=core, option={'chip_erase_mode': 'ERASE_UICR',
-                                                         'ext_mem_erase_mode': 'ERASE_NONE'})
+                self.exec_op('erase', core=core, kind='uicr')
         else:
             if self.erase:
                 erase_arg = 'ERASE_ALL'

scripts/west_commands/runners/nrfjprog.py

@@ -106,6 +106,8 @@ def do_exec_op(self, op, force=False):
                 cmd.append('--reset')
             if _op['kind'] == 'RESET_PIN':
                 cmd.append('--pinreset')
+        elif op_type == 'erase':
+            cmd.append(f'--erase{_op["kind"]}')
         else:
             raise RuntimeError(f'Invalid operation: {op_type}')
 

scripts/west_commands/runners/nrfutil.py

@@ -121,8 +121,7 @@ def _append_batch(self, op, json_file):
         elif op_type == 'reset':
             cmd += ['--reset-kind', _op['kind']]
         elif op_type == 'erase':
-            cmd += ['--reset-kind', _op['kind']]
-
+            cmd.append(f'--{_op["kind"]}')
 
         cmd += ['--core', op['core']] if op.get('core') else []
         cmd += ['--x-family', f'{self.family}']