boards: u-blox: ubx_evk_iris_w1_rw612: fix flash config

correct flash_config.c file for different flash varient
fix spelling error across board files
update boards/deprecated.cmake to help older release support

Signed-off-by: Tarang Patel <tarang3399.patel@gmail.com>

boards/deprecated.cmake

@@ -64,3 +64,6 @@ set(esp32s3_devkitm/esp32s3/procpu_DEPRECATED
 set(esp32s3_devkitm/esp32s3/appcpu_DEPRECATED
     esp32s3_devkitc/esp32s3/appcpu
 )
+set(ubx_evk_iris_w1_fidelex/rw612_DEPRECATED
+    ubx_evk_iris_w1@fidelix/rw612
+)

boards/u-blox/ubx_evk_iris_w1/CMakeLists.txt

@@ -11,8 +11,8 @@ if(CONFIG_NXP_RW6XX_BOOT_HEADER)
 
   if(BOARD_REVISION STREQUAL "macronix")
     zephyr_library_sources(macronix_flash_config.c)
-  elseif(BOARD_REVISION STREQUAL "fidelex")
-    zephyr_library_sources(fidelex_flash_config.c)
+  elseif(BOARD_REVISION STREQUAL "fidelix")
+    zephyr_library_sources(fidelix_flash_config.c)
   else()
     message(FATAL_ERROR "Unsupported board revision: ${BOARD_REVISION}")
   endif()

boards/u-blox/ubx_evk_iris_w1/board.yml

@@ -4,9 +4,9 @@ board:
   vendor: u-blox
   revision:
     format: custom
-    default: fidelex
+    default: fidelix
     revisions:
       - name: "macronix"
-      - name: "fidelex"
+      - name: "fidelix"
   socs:
     - name: rw612

boards/u-blox/ubx_evk_iris_w1/doc/index.rst

@@ -39,14 +39,14 @@ Flash Memory Configuration
 The IRIS-W1 board uses different flash vendors depending on revision:
 
 - ``@macronix``: Module build up to 2023 week 45
-- ``@fidelex``: Module build 2023 week 46 (2346) onward
+- ``@fidelix``: Module build 2023 week 46 (2346) onward
 
 To build for a specific flash version:
 
 .. code-block:: bash
 
    west build -b ubx_evk_iris_w1@macronix
-   west build -b ubx_evk_iris_w1@fidelex
+   west build -b ubx_evk_iris_w1@fidelix
 
 Supported Features
 ==================

boards/u-blox/ubx_evk_iris_w1/fidelix_flash_config.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2021-2024 NXP
  *
+ * Copyright (c) 2025 u-blox AG
+ *
  * SPDX-License-Identifier: Apache-2.0
  */
 

boards/u-blox/ubx_evk_iris_w1/macronix_flash_config.c

@@ -1,6 +1,7 @@
 /*
- * Copyright 2021-2024 NXP
- * All rights reserved.
+ * Copyright (c) 2021-2024 NXP
+ *
+ * Copyright (c) 2025 u-blox AG
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -20,7 +21,7 @@ const fc_flexspi_nor_config_t flexspi_config = {
 			.seqNum = 1,
 			.seqId = 2,
 		},
-		.deviceModeArg = 0x0200,
+		.deviceModeArg = 0xC740,
 		.configCmdEnable = 0,
 		.deviceType = 0x1,
 		.sflashPadType = kSerialFlash_4Pads,
@@ -37,14 +38,9 @@ const fc_flexspi_nor_config_t flexspi_config = {
 				FC_FLEXSPI_4PAD, 0x18),
 			[1] = FC_FLEXSPI_LUT_SEQ(
 				FC_MODE8_SDR,
-				FC_FLEXSPI_4PAD, 0x00,
+				FC_FLEXSPI_4PAD, 0x0A,
 				FC_DUMMY_SDR,
 				FC_FLEXSPI_4PAD, 0x04),
-			[2] = FC_FLEXSPI_LUT_SEQ(
-				FC_READ_SDR,
-				FC_FLEXSPI_4PAD, 0x04,
-				FC_STOP_EXE,
-				FC_FLEXSPI_1PAD, 0x00),
 
 			/* Read Status */
 			[4 * 1 + 0] = FC_FLEXSPI_LUT_SEQ(
@@ -62,14 +58,6 @@ const fc_flexspi_nor_config_t flexspi_config = {
 				FC_FLEXSPI_1PAD,
 				0x02),
 
-			/* Write Enable */
-			[4 * 3 + 0] = FC_FLEXSPI_LUT_SEQ(
-				FC_CMD_SDR,
-				FC_FLEXSPI_1PAD,
-				0x06, FC_STOP_EXE,
-				FC_FLEXSPI_1PAD,
-				0x00),
-
 			/* Sector erase */
 			[4 * 5 + 0] = FC_FLEXSPI_LUT_SEQ(
 				FC_CMD_SDR,
@@ -93,6 +81,7 @@ const fc_flexspi_nor_config_t flexspi_config = {
 				0x02, FC_RADDR_SDR,
 				FC_FLEXSPI_1PAD,
 				0x18),
+
 			[4 * 9 + 1] = FC_FLEXSPI_LUT_SEQ(
 				FC_WRITE_SDR,
 				FC_FLEXSPI_1PAD,
@@ -114,5 +103,5 @@ const fc_flexspi_nor_config_t flexspi_config = {
 	.sectorSize = 0x1000,
 	.ipcmdSerialClkFreq = 0,
 	.blockSize = 0x8000,
-	.fcb_fill = 0xFFFFFFFFU,
+	.fcb_fill[0] = 0xFFFFFFFFU,
 };

boards/u-blox/ubx_evk_iris_w1/revision.cmake

@@ -1,14 +1,16 @@
 # Copyright (c) 2025 u-blox AG
 # SPDX-License-Identifier: Apache-2.0
 
+set(BOARD_REVISIONS "macronix" "fidelix")
+
 if(NOT BOARD_REVISION)
-  set(BOARD_REVISION fidelex CACHE STRING "Board revision")
+  set(BOARD_REVISION "fidelix")
 endif()
 
 # Validate revision
-if(NOT BOARD_REVISION STREQUAL "macronix" AND NOT BOARD_REVISION STREQUAL "fidelex")
+if(NOT BOARD_REVISION STREQUAL "macronix" AND NOT BOARD_REVISION STREQUAL "fidelix")
   message(FATAL_ERROR
     "Invalid BOARD_REVISION: ${BOARD_REVISION}\n"
-    "Must be one of: macronix, fidelex"
+    "Must be one of: macronix, fidelix"
   )
 endif()

boards/u-blox/ubx_evk_iris_w1/ubx_evk_iris_w1_rw612_macronix_defconfig

@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2025 u-blox AG
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_GPIO=y
-CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
-CONFIG_TRUSTED_EXECUTION_SECURE=y