[nrf fromtree] scripts: runners: nrf: Generalize the use of --erase-mode for all ICs

Until now, for historical reasons (see
f42cef9 and
58e0e31), the use of the --erase-mode
command-line switch was reserved for the nRF54L family. But in fact this
can be used (instead of --erase) for any of the Nordic ICs. This patch
extends the usage of this switch regardless of family.

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

Author: carlescufi

scripts/west_commands/runners/nrf_common.py

@@ -357,10 +357,13 @@ def program_hex(self):
             if not self.erase and regtool_generated_uicr:
                 self.exec_op('erase', core=core, kind='uicr')
         else:
+            erase_mode = self._get_erase_mode(self.erase_mode)
             if self.erase:
                 erase_arg = 'ERASE_ALL'
+            elif self.erase_mode:
+                erase_arg = erase_mode
             elif self.family == 'nrf54l':
-                erase_arg = self._get_erase_mode(self.erase_mode) or 'ERASE_NONE'
+                erase_arg = 'ERASE_NONE'
             else:
                 erase_arg = 'ERASE_RANGES_TOUCHED_BY_FIRMWARE'
 
@@ -479,10 +482,6 @@ def do_run(self, command, **kwargs):
 
         self.ensure_family()
 
-        if self.family != 'nrf54l' and self.erase_mode:
-            raise RuntimeError('Option --erase-mode can only be used with the '
-                               'nRF54L family.')
-
         self.ensure_output('hex')
         if IntelHex is None:
             raise RuntimeError('Python dependency intelhex was missing; '