soc: nxp: convert LPC SOC family to hardware model V2

Move LPC family to HWMv2

Signed-off-by: David Leach <[email protected]>

soc: nxp: convert LPC SOC family to hardware model V2

Move LPC family to HWMv2

Signed-off-by: David Leach <[email protected]>

Author: dleach02

soc/soc_legacy/arm/nxp_lpc/CMakeLists.txt renamed to soc/nxp/lpc/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright 2017,2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_LPC
+	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select CLOCK_CONTROL
+	select ARM
+
+if SOC_FAMILY_LPC
+rsource "*/Kconfig"
+
+endif # SOC_FAMILY_LPC

soc/nxp/lpc/Kconfig

@@ -0,0 +1,14 @@
+# Copyright 2017,2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_FAMILY_LPC
+
+config SERIAL_INIT_PRIORITY
+	default 55 if SERIAL
+
+config BUILD_WITH_TFM
+	default y if TRUSTED_EXECUTION_NONSECURE
+
+rsource "*/Kconfig.defconfig"
+
+endif # SOC_FAMILY_LPC

soc/nxp/lpc/Kconfig.defconfig

@@ -0,0 +1,10 @@
+# Copyright 2017,2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_LPC
+	bool
+
+config SOC_FAMILY
+	default "lpc" if SOC_FAMILY_LPC
+
+rsource "*/Kconfig.soc"

soc/nxp/lpc/Kconfig.soc

@@ -1,7 +1,9 @@
 #
-# Copyright (c) 2017, NXP
+# Copyright 2017, 2024 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
+zephyr_include_directories(.)
+
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/soc_legacy/arm/nxp_lpc/lpc11u6x/CMakeLists.txt renamed to soc/nxp/lpc/lpc11u6x/CMakeLists.txt

@@ -1,15 +1,14 @@
 # LPC LPC11U6X MCU line
-
+#
 # Copyright (c) 2020, Seagate
+# Copyright 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
 config SOC_SERIES_LPC11U6X
-	bool "LPC LPC11U6X Series MCU"
 	select ARM
 	select CPU_CORTEX_M0PLUS
 	select CPU_CORTEX_M_HAS_SYSTICK
-	select SOC_FAMILY_LPC
 	select PINCTRL
 	select CLOCK_CONTROL
-	help
-	  Enable support for LPC LPC11U6X MCU series

soc/soc_legacy/arm/nxp_lpc/lpc11u6x/Kconfig.series renamed to soc/nxp/lpc/lpc11u6x/Kconfig

@@ -1,15 +1,13 @@
-# LPC11U6X series configuration options
-
+# LPC LPC11U6X MCU line
+#
 # Copyright (c) 2020, Seagate
+# Copyright 2024 NXP
+#
 # SPDX-License-Identifier: Apache-2.0
+#
 
 if SOC_SERIES_LPC11U6X
 
-source "soc/soc_legacy/arm/nxp_lpc/lpc11u6x/Kconfig.defconfig.lp*"
-
-config SOC_SERIES
-	default "lpc11u6x"
-
 config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 40

soc/soc_legacy/arm/nxp_lpc/lpc11u6x/Kconfig.defconfig.series renamed to soc/nxp/lpc/lpc11u6x/Kconfig.defconfig

@@ -1,24 +1,34 @@
-# LPC LPC11U6x MCU line
+# NXP LPC11U6x series
 
-# Copyright (c) 2020, Seagate
+# Copyright 2024 NXP
+
+#
 # SPDX-License-Identifier: Apache-2.0
+#
+
+config SOC_SERIES_LPC11U6X
+	bool
+	select SOC_FAMILY_LPC
 
-choice
-	prompt "LPC LPC11U6X MCU Selection"
-	depends on SOC_SERIES_LPC11U6X
+config SOC_SERIES
+	default "lpc11u6x" if SOC_SERIES_LPC11U6X
 
 config SOC_LPC11U68
-	bool "SOC_LPC11U68"
+	bool
+	select SOC_SERIES_LPC11U6X
 
 config SOC_LPC11U67
-	bool "SOC_LPC11U67"
+	bool
+	select SOC_SERIES_LPC11U6X
 
 config SOC_LPC11U66
-	bool "SOC_LPC11U66"
-
-endchoice
+	bool
+	select SOC_SERIES_LPC11U6X
 
-if SOC_SERIES_LPC11U6X
+config SOC
+	default "lpc11u66" if SOC_LPC11U66
+	default "lpc11u67" if SOC_LPC11U67
+	default "lpc11u68" if SOC_LPC11U68
 
 config SOC_PART_NUMBER_LPC11U66JBD48
 	bool
@@ -35,18 +45,11 @@ config SOC_PART_NUMBER_LPC11U68JBD64
 config SOC_PART_NUMBER_LPC11U68JBD100
 	bool
 
-config SOC_PART_NUMBER_LPC11U6X
-	string
+config SOC_PART_NUMBER
 	default "LPC11U66JBD48" if SOC_PART_NUMBER_LPC11U66JBD48
 	default "LPC11U67JBD48" if SOC_PART_NUMBER_LPC11U67JBD48
 	default "LPC11U67JBD64" if SOC_PART_NUMBER_LPC11U67JBD64
 	default "LPC11U67JBD100" if SOC_PART_NUMBER_LPC11U67JBD100
 	default "LPC11U68JBD48" if SOC_PART_NUMBER_LPC11U68JBD48
 	default "LPC11U68JBD64" if SOC_PART_NUMBER_LPC11U68JBD64
 	default "LPC11U68JBD100" if SOC_PART_NUMBER_LPC11U68JBD100
-
-	help
-	  This string holds the full part number of the SoC. It is a hidden
-	  option that you should not set directly. The part number selection
-	  choice defines the default value for this string.
-endif # SOC_SERIES_LPC11U6X