boards: nxp: convert lpcxpresso54114 to hwmv2

Convert lpcxpresso54114

Signed-off-by: David Leach <david.leach@nxp.com>

boards/boards_legacy/arm/lpcxpresso54114/Kconfig.board

@@ -1,14 +0,0 @@
-# LPCXpresso54114 board
-
-# Copyright (c) 2017, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_LPCXPRESSO54114_M4
-	bool "NXP LPCXPRESSO-54114 M4"
-	depends on SOC_SERIES_LPC54XXX
-	select SOC_PART_NUMBER_LPC54114J256BD64
-
-config BOARD_LPCXPRESSO54114_M0
-	bool "NXP LPCXPRESSO-54114 M0"
-	depends on SOC_SERIES_LPC54XXX
-	select SOC_PART_NUMBER_LPC54114J256BD64

boards/boards_legacy/arm/lpcxpresso54114/Kconfig.defconfig

@@ -1,23 +0,0 @@
-# LPCXpresso54114 board
-
-# Copyright (c) 2017, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_LPCXPRESSO54114_M4 || BOARD_LPCXPRESSO54114_M0
-
-config BOARD
-	default "lpcxpresso54114_m4" if BOARD_LPCXPRESSO54114_M4
-	default "lpcxpresso54114_m0" if BOARD_LPCXPRESSO54114_M0
-
-# Place size restrictions on first image if dual core is enabled
-if SECOND_CORE_MCUX && BOARD_LPCXPRESSO54114_M4
-
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # SECOND_CORE_MCUX && BOARD_LPCXPRESSO54114_M4
-
-endif # BOARD_LPCXPRESSO54114_M4 || BOARD_LPCXPRESSO54114_M0

boards/boards_legacy/arm/lpcxpresso54114/board.cmake

@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2017, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if(CONFIG_BOARD_LPCXPRESSO54114_M4 OR CONFIG_SECOND_CORE_MCUX)
-board_runner_args(jlink "--device=LPC54114J256_M4" "--reset-after-load")
-elseif(CONFIG_BOARD_LPCXPRESSO54114_M0)
-board_runner_args(jlink "--device=LPC54114J256_M0" "--reset-after-load")
-endif()
-
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/nxp/lpcxpresso54114/Kconfig.defconfig

@@ -0,0 +1,15 @@
+# LPCXpresso54114 board
+#
+# Copyright (c) 2017, 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+# Place size restrictions on first image if dual core is enabled
+if SECOND_CORE_MCUX && BOARD_LPCXPRESSO54114_LPC54114_M4
+
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+endif # SECOND_CORE_MCUX && BOARD_LPCXPRESSO54114_LPC54114_M4

boards/nxp/lpcxpresso54114/Kconfig.lpcxpresso54114

@@ -0,0 +1,9 @@
+# LPCXpresso54114 board
+
+# Copyright 2017, 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_LPCXPRESSO54114
+	select SOC_LPC54114_M4 if BOARD_LPCXPRESSO54114_LPC54114_M4
+	select SOC_LPC54114_M0 if BOARD_LPCXPRESSO54114_LPC54114_M0
+	select SOC_PART_NUMBER_LPC54114J256BD64

boards/nxp/lpcxpresso54114/board.cmake

@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2017, NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if(BOARD_LPCXPRESSO54114_LPC54114_M4 OR CONFIG_SECOND_CORE_MCUX)
+  board_runner_args(jlink "--device=LPC54114J256_M4" "--reset-after-load")
+elseif(BOARD_LPCXPRESSO54114_LPC54114_M0)
+  board_runner_args(jlink "--device=LPC54114J256_M0" "--reset-after-load")
+endif()
+
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/nxp/lpcxpresso54114/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: lpcxpresso54114
+  vendor: nxp
+  socs:
+    - name: lpc54114

boards/nxp/lpcxpresso54114/doc/index.rst

@@ -74,8 +74,8 @@ features:
 
 The default configuration for each core can be found in the defconfig files:
 
-	``boards/arm/lpcxpresso54114/lpcxpresso54114_m4_defconfig``
+	`boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m4_defconfig`
-	``boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig``
+	`boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m0_defconfig`
 
 Other hardware features are not currently supported by the port.
 
@@ -170,7 +170,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: lpcxpresso54114_m4
+   :board: lpcxpresso54114/lpc54114/m4
    :goals: flash
 
 Open a serial terminal, reset the board (press the SW4 button), and you should
@@ -188,7 +188,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: lpcxpresso54114_m4
+   :board: lpcxpresso54114/lpc54114/m4
    :goals: debug
 
 Open a serial terminal, step through the application in your debugger, and you

boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m0.yaml

@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2017, NXP
+# Copyright (c) 2017, 2024 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: lpcxpresso54114_m0
+identifier: lpcxpresso54114/lpc54114/m0
 name: NXP LPCXpresso54114 M0
 type: mcu
 arch: arm

boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m0_defconfig

@@ -1,12 +1,9 @@
 #
-# Copyright (c) 2017, NXP
+# Copyright (c) 2017, 2024 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_LPC54114_M0=y
-CONFIG_SOC_SERIES_LPC54XXX=y
-CONFIG_BOARD_LPCXPRESSO54114_M0=y
 CONFIG_USE_SEGGER_RTT=y
 CONFIG_SERIAL=n
 CONFIG_GPIO=n

boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m4.yaml

@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2017, NXP
+# Copyright (c) 2017, 2024 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: lpcxpresso54114_m4
+identifier: lpcxpresso54114/lpc54114/m4
 name: NXP LPCXpresso54114 M4
 type: mcu
 arch: arm

boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m4_defconfig

@@ -1,12 +1,9 @@
 #
-# Copyright (c) 2017, NXP
+# Copyright (c) 2017, 2024 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_LPC54114_M4=y
-CONFIG_SOC_SERIES_LPC54XXX=y
-CONFIG_BOARD_LPCXPRESSO54114_M4=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

samples/drivers/ipm/ipm_mcux/Kconfig.sysbuild

@@ -6,5 +6,5 @@ source "share/sysbuild/Kconfig"
 
 config IPM_REMOTE_BOARD
 string
-	default "lpcxpresso54114_m0" if $(BOARD) = "lpcxpresso54114_m4"
+	default "lpcxpresso54114/lpc54114/m0" if $(BOARD) = "lpcxpresso54114"
-	default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0"
+	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"

samples/drivers/mbox/Kconfig.sysbuild

@@ -13,4 +13,4 @@ string
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
-	default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0"
+	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"

samples/drivers/mbox_data/Kconfig.sysbuild

@@ -9,4 +9,4 @@ string
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
-	default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0"
+	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"

samples/subsys/ipc/openamp/Kconfig.sysbuild

@@ -6,8 +6,8 @@ source "share/sysbuild/Kconfig"
 
 config OPENAMP_REMOTE_BOARD
 string
-	default "lpcxpresso54114_m0" if $(BOARD) = "lpcxpresso54114_m4"
+	default "lpcxpresso54114/lpc54114/m0" if $(BOARD) = "lpcxpresso54114"
-	default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0"
+	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "mps2/an521/cpu1" if $(BOARD) = "mps2"
 	default "v2m_musca_b1/musca_b1/ns" if $(BOARD) = "v2m_musca_b1"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"

samples/subsys/ipc/rpmsg_service/Kconfig.sysbuild

@@ -8,7 +8,7 @@ config RPMSG_REMOTE_BOARD
 	string
 	default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
 	default "bl5340_dvk/nrf5340/cpunet" if $(BOARD) = "bl5340_dvk"
-	default "lpcxpresso54114_m0" if $(BOARD) = "lpcxpresso54114_m4"
+	default "lpcxpresso54114/lpc54114/m0" if $(BOARD) = "lpcxpresso54114"
 	default "mps2_an521_remote" if $(BOARD) = "mps2_an521"
 	default "v2m_musca_b1_ns" if $(BOARD) = "v2m_musca_b1"
 	default "esp32_devkitc_wroom_appcpu" if $(BOARD) = "esp32_devkitc_wroom"