initrd: strip layout flags from flashprog wp invocations

flashprog wp subcommands (status, list, enable, disable, range) do not
accept --ifd, -i <region>, or --image <region> layout flags. Boards
like novacustom-v560tu/v540tu include these in CONFIG_FLASH_OPTIONS,
causing 'unrecognized option' errors from check_spi_wp() and the
config-gui WP status check.

Strip --ifd, --image <region>, and -i <region> alongside --progress
when building wp_opts in both flash.sh and config-gui.sh.

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Author: tlaurion

initrd/bin/config-gui.sh

@@ -708,9 +708,14 @@ while true; do
 				;;
 			"w")
 				unset wp_out wp_title wp_opts
-				# flashprog wp subcommand; strip binary and --progress (not accepted by wp)
+				# flashprog wp subcommand; strip binary name, --progress, and layout
+				# flags (--ifd, -i <region>) which wp subcommands do not accept.
 				wp_opts="${CONFIG_FLASH_OPTIONS#flashprog}"
-				wp_opts="${wp_opts//--progress/}"
+				wp_opts="$(echo "$wp_opts" | \
+					sed 's/--progress[[:space:]]*//' | \
+					sed 's/--ifd[[:space:]]*//' | \
+					sed 's/--image[[:space:]]*[a-z][a-z]*[[:space:]]*//g' | \
+					sed 's/-i[[:space:]]*[a-z][a-z]*[[:space:]]*//g')"
 				wp_out=$(flashprog wp status $wp_opts 2>&1) || true
 				if echo "$wp_out" | grep -q "Protection mode: disabled"; then
 					wp_title="SPI Write Protection: DISABLED"

initrd/bin/flash.sh

@@ -36,9 +36,14 @@ check_spi_wp() {
   TRACE_FUNC
   local wp_out wp_rc wp_opts
   flash_status "Checking SPI write protection status..."
-  # Build 'flashprog wp status' args: strip binary name and --progress flag
+  # Build 'flashprog wp status' args: strip binary name, --progress, and layout
+  # flags (--ifd, -i <region>) which wp subcommands do not accept.
   wp_opts="${CONFIG_FLASH_OPTIONS#flashprog}"
-  wp_opts="${wp_opts//--progress/}"
+  wp_opts="$(echo "$wp_opts" | \
+    sed 's/--progress[[:space:]]*//' | \
+    sed 's/--ifd[[:space:]]*//' | \
+    sed 's/--image[[:space:]]*[a-z][a-z]*[[:space:]]*//g' | \
+    sed 's/-i[[:space:]]*[a-z][a-z]*[[:space:]]*//g')"
   wp_rc=0
   wp_out=$(flashprog wp status $wp_opts 2>&1) || wp_rc=$?
   echo "$wp_out"