soc: nxp: mcx: MCXNx4x: update SOC to use flash_k4 driver

Use flash_k4 driver for internal flash instead of ROM API driver.  One
benefit is the flash program phrase size decreases from 128 Bytes to 16
Bytes.  16 Byte phrases enables this SOC to leverage the Zephyr NVS
subsystem, and the MCUboot swap mode.

Signed-off-by: Derek Snell <derek.snell@nxp.com>

Conflicts:
	west.yml

dts/arm/nxp/nxp_mcxnx4x_common.dtsi

@@ -629,8 +629,7 @@
 			compatible = "soc-nv-flash";
 			reg = <0 DT_SIZE_M(2)>;
 			erase-block-size = <8192>;
-			/* MCXN54x ROM Flash API supports writing of 128B pages. */
-			write-block-size = <128>;
+			write-block-size = <16>;
 		};
 
 		uuid: uuid@1100000 {

modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake

@@ -197,7 +197,7 @@ if(CONFIG_SOC_MK82F25615 OR CONFIG_SOC_MK64F12 OR CONFIG_SOC_MK66F18 OR
   set(CONFIG_MCUX_COMPONENT_driver.sysmpu ON)
 endif()
 
-if(CONFIG_SOC_SERIES_MCXW)
+if(CONFIG_SOC_SERIES_MCXW OR CONFIG_SOC_MCXN947 OR CONFIG_SOC_MCXN547)
   set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.flash_k4)
 endif()
 
@@ -262,7 +262,7 @@ if(CONFIG_SOC_SERIES_MCXA)
   set(CONFIG_MCUX_COMPONENT_driver.romapi ON)
 endif()
 
-if(CONFIG_SOC_SERIES_MCXN)
+if(CONFIG_SOC_SERIES_MCXN AND !CONFIG_SOC_MCXN947 AND !CONFIG_SOC_MCXN547)
   set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.romapi_flashiap)
 endif()
 

soc/nxp/mcx/mcxn/Kconfig.defconfig

@@ -24,8 +24,12 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 16000 if MCUX_LPTMR_TIMER
 	default 150000000 if CORTEX_M_SYSTICK
 
+config MCUX_FLASH_K4_API
+	default y if (SOC_MCXN947 || SOC_MCXN547) # Initially, only Nx4x uses the k4 driver
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
+	default 16 if (SOC_MCXN947 || SOC_MCXN547) # Initially, only Nx4x uses the k4 driver
 	default 128
 
 # The existing SAI diver cannot initialize the PLL on the board,

west.yml

@@ -210,7 +210,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: cea5006f1829520e40db1b550a9f49cc69ceba7d
+      revision: 2fe4ab6cd0d5586d12cc396197d956493575a0dd
       path: modules/hal/nxp
       groups:
         - hal