From 3728a809295b741038d6904b633d9b99a2b8ab0e Mon Sep 17 00:00:00 2001 From: Andrej Butok Date: Wed, 4 Jun 2025 16:45:18 +0200 Subject: [PATCH] boards: nxp: mcxn947: enable the default MCU-Boot swap mode - Enables MCU-Boot default Swap mode for the FRDM-MCXN947 and MCX-N9XX-EVK, after the flash driver was upgraded to support the 16-byte programming. - Fixes flash-controller for frdm_mcxn947_mcxn947_cpu0_qspi. Signed-off-by: Andrej Butok --- boards/nxp/frdm_mcxn947/Kconfig.defconfig | 7 ------- boards/nxp/frdm_mcxn947/Kconfig.sysbuild | 6 ------ boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi | 3 --- boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0_qspi.dts | 1 + boards/nxp/mcx_n9xx_evk/Kconfig.defconfig | 7 ------- boards/nxp/mcx_n9xx_evk/Kconfig.sysbuild | 6 ------ boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk.dtsi | 3 --- boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk_mcxn947_cpu0_qspi.dts | 1 + 8 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 boards/nxp/frdm_mcxn947/Kconfig.sysbuild delete mode 100644 boards/nxp/mcx_n9xx_evk/Kconfig.sysbuild diff --git a/boards/nxp/frdm_mcxn947/Kconfig.defconfig b/boards/nxp/frdm_mcxn947/Kconfig.defconfig index 5334a121e40..461a4ed6286 100644 --- a/boards/nxp/frdm_mcxn947/Kconfig.defconfig +++ b/boards/nxp/frdm_mcxn947/Kconfig.defconfig @@ -14,11 +14,4 @@ config MAIN_STACK_SIZE endif -if BOOTLOADER_MCUBOOT -choice MCUBOOT_BOOTLOADER_MODE - # Board only supports MCUBoot via "upgrade only" method: - default MCUBOOT_BOOTLOADER_MODE_OVERWRITE_ONLY -endchoice -endif #BOOTLOADER_MCUBOOT - endif diff --git a/boards/nxp/frdm_mcxn947/Kconfig.sysbuild b/boards/nxp/frdm_mcxn947/Kconfig.sysbuild deleted file mode 100644 index 4625c7d2929..00000000000 --- a/boards/nxp/frdm_mcxn947/Kconfig.sysbuild +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 NXP -# SPDX-License-Identifier: Apache-2.0 - -choice MCUBOOT_MODE - default MCUBOOT_MODE_OVERWRITE_ONLY -endchoice diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi b/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi index bc96afa35ed..a3fdcd7f9a0 100644 --- a/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi +++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi @@ -153,9 +153,6 @@ nxp_8080_touch_panel_i2c: &flexcomm2_lpi2c2 { label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(80)>; }; - /* For the MCUBoot "upgrade only" method, - * the slot sizes must be equal. - */ slot0_partition: partition@14000 { label = "image-0"; reg = <0x00014000 DT_SIZE_K(984)>; diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0_qspi.dts b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0_qspi.dts index 48a35e2e661..14759e4e870 100644 --- a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0_qspi.dts +++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0_qspi.dts @@ -19,6 +19,7 @@ chosen { zephyr,flash = &w25q64jvssiq; + zephyr,flash-controller = &w25q64jvssiq; }; }; diff --git a/boards/nxp/mcx_n9xx_evk/Kconfig.defconfig b/boards/nxp/mcx_n9xx_evk/Kconfig.defconfig index 286acdad25f..3defc126f7e 100644 --- a/boards/nxp/mcx_n9xx_evk/Kconfig.defconfig +++ b/boards/nxp/mcx_n9xx_evk/Kconfig.defconfig @@ -14,11 +14,4 @@ config MAIN_STACK_SIZE endif -if BOOTLOADER_MCUBOOT -choice MCUBOOT_BOOTLOADER_MODE - # Board only supports MCUBoot via "upgrade only" method: - default MCUBOOT_BOOTLOADER_MODE_OVERWRITE_ONLY -endchoice -endif #BOOTLOADER_MCUBOOT - endif diff --git a/boards/nxp/mcx_n9xx_evk/Kconfig.sysbuild b/boards/nxp/mcx_n9xx_evk/Kconfig.sysbuild deleted file mode 100644 index 4625c7d2929..00000000000 --- a/boards/nxp/mcx_n9xx_evk/Kconfig.sysbuild +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 NXP -# SPDX-License-Identifier: Apache-2.0 - -choice MCUBOOT_MODE - default MCUBOOT_MODE_OVERWRITE_ONLY -endchoice diff --git a/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk.dtsi b/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk.dtsi index e85fcff4ffd..b159581e3cf 100644 --- a/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk.dtsi +++ b/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk.dtsi @@ -135,9 +135,6 @@ nxp_8080_touch_panel_i2c: &flexcomm2_lpi2c2 { label = "mcuboot"; reg = <0x00000000 DT_SIZE_K(80)>; }; - /* For the MCUBoot "upgrade only" method, - * the slot sizes must be equal. - */ slot0_partition: partition@14000 { label = "image-0"; reg = <0x00014000 DT_SIZE_K(984)>; diff --git a/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk_mcxn947_cpu0_qspi.dts b/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk_mcxn947_cpu0_qspi.dts index f6e9db814cb..7f718db2e6d 100644 --- a/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk_mcxn947_cpu0_qspi.dts +++ b/boards/nxp/mcx_n9xx_evk/mcx_n9xx_evk_mcxn947_cpu0_qspi.dts @@ -19,6 +19,7 @@ chosen { zephyr,flash = &w25q64jwtbjq; + zephyr,flash-controller = &w25q64jwtbjq; }; };