soc: ti_simplelink: Port to HWMv2

Ports the ti_simplelink SoC configurations to hardware model version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

soc/soc_legacy/arm/ti_simplelink/Kconfig

@@ -1,22 +0,0 @@
-# Texas Instruments SimpleLink Family
-
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_FAMILY_TISIMPLELINK
-	bool
-
-if SOC_FAMILY_TISIMPLELINK
-
-config SOC_FAMILY
-	string
-	default "ti_simplelink"
-
-source "soc/soc_legacy/arm/ti_simplelink/*/Kconfig.soc"
-
-config HAS_TI_CCFG
-	bool
-	help
-	  Selected when CCFG (Customer Configuration) registers
-	  appear at the end of flash
-
-endif # SOC_FAMILY_TISIMPLELINK

soc/soc_legacy/arm/ti_simplelink/Kconfig.defconfig

@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-source "soc/soc_legacy/arm/ti_simplelink/*/Kconfig.defconfig.series"

soc/soc_legacy/arm/ti_simplelink/Kconfig.soc

@@ -1,5 +0,0 @@
-# Texas Instruments SimpleLink Family
-
-# SPDX-License-Identifier: Apache-2.0
-
-source "soc/soc_legacy/arm/ti_simplelink/*/Kconfig.series"

soc/soc_legacy/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc1352r

@@ -1,9 +0,0 @@
-# Texas Instruments SimpleLink CC1352R
-#
-# Copyright (c) 2019 Brett Witherspoon
-#
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC
-	default "cc1352r"
-	depends on SOC_CC1352R

soc/soc_legacy/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc2652r

@@ -1,8 +0,0 @@
-# Texas Instruments SimpleLink CC2652R
-
-# Copyright (c) 2019 Brett Witherspoon
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC
-	default "cc2652r"
-	depends on SOC_CC2652R

soc/soc_legacy/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series

@@ -1,21 +0,0 @@
-# Texas Instruments SimpleLink CC13x2 / CC26x2
-
-# Copyright (c) 2019 Brett Witherspoon
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_CC13X2_CC26X2
-	bool "TI SimpleLink Family CC13x2 / CC26x2"
-	select ARM
-	select CPU_CORTEX_M4
-	select CPU_HAS_ARM_MPU
-	select DYNAMIC_INTERRUPTS
-	select CPU_CORTEX_M_HAS_DWT
-	select CPU_HAS_FPU
-	select SOC_FAMILY_TISIMPLELINK
-	select HAS_CC13X2_CC26X2_SDK
-	select HAS_TI_CCFG if !BOOTLOADER_MCUBOOT
-	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
-	select HAS_PM
-	select HAS_POWEROFF
-	help
-	  Enable support for TI SimpleLink CC13x2 / CC26x2 SoCs

soc/soc_legacy/arm/ti_simplelink/cc13x2x7_cc26x2x7/Kconfig.defconfig.cc1352r7

@@ -1,9 +0,0 @@
-# Texas Instruments SimpleLink CC1352R
-#
-# Copyright (c) 2022 Vaishnav Achath
-#
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC
-	default "cc1352r7"
-	depends on SOC_CC1352R7

soc/soc_legacy/arm/ti_simplelink/cc13x2x7_cc26x2x7/Kconfig.defconfig.cc2652r7

@@ -1,8 +0,0 @@
-# Texas Instruments SimpleLink CC2652R
-
-# Copyright (c) 2022 Vaishnav Achath
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC
-	default "cc2652r7"
-	depends on SOC_CC2652R7

soc/soc_legacy/arm/ti_simplelink/cc13x2x7_cc26x2x7/Kconfig.series

@@ -1,20 +0,0 @@
-# Texas Instruments SimpleLink CC13x2 / CC26x2
-
-# Copyright (c) 2022 Vaishnav Achath
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_CC13X2X7_CC26X2X7
-	bool "TI SimpleLink Family CC13x2x7/ CC26x2x7"
-	select ARM
-	select CPU_CORTEX_M4
-	select CPU_HAS_ARM_MPU
-	select DYNAMIC_INTERRUPTS
-	select CPU_CORTEX_M_HAS_DWT
-	select CPU_HAS_FPU
-	select SOC_FAMILY_TISIMPLELINK
-	select HAS_CC13X2X7_CC26X2X7_SDK
-	select HAS_TI_CCFG if !BOOTLOADER_MCUBOOT
-	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
-	select HAS_PM
-	help
-	  Enable support for TI SimpleLink CC13x2x7 / CC26x2x7 SoCs

soc/soc_legacy/arm/ti_simplelink/cc32xx/Kconfig.series

@@ -1,13 +0,0 @@
-# TI SimpleLink CC32xx
-
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_CC32XX
-	bool "TI SimpleLink Family"
-	select ARM
-	select CPU_CORTEX_M4
-	select CPU_CORTEX_M_HAS_DWT
-	select DYNAMIC_INTERRUPTS
-	select SOC_FAMILY_TISIMPLELINK
-	help
-	  Enable support for TI SimpleLink CC32xx

soc/soc_legacy/arm/ti_simplelink/msp432p4xx/Kconfig.soc

@@ -1,13 +0,0 @@
-# Texas Instruments MSP432P401R
-
-# Copyright (c) 2017, Linaro Ltd
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "TI SimpleLink MCU Selection"
-	depends on SOC_SERIES_MSP432P4XX
-
-config SOC_MSP432P401R
-	bool "MSP432P401R"
-	select HAS_MSP432P4XXSDK
-endchoice

soc/ti/simplelink/Kconfig

@@ -0,0 +1,14 @@
+# Texas Instruments SimpleLink Family
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_FAMILY_TI_SIMPLELINK
+
+rsource "*/Kconfig"
+
+config HAS_TI_CCFG
+	bool
+	help
+	  Selected when CCFG (Customer Configuration) registers
+	  appear at the end of flash
+
+endif # SOC_FAMILY_TI_SIMPLELINK

soc/ti/simplelink/Kconfig.defconfig

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+rsource "*/Kconfig.defconfig"

soc/ti/simplelink/Kconfig.soc

@@ -0,0 +1,10 @@
+# Texas Instruments SimpleLink Family
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_TI_SIMPLELINK
+	bool
+
+config SOC_FAMILY
+	default "ti_simplelink" if SOC_FAMILY_TI_SIMPLELINK
+
+rsource "*/Kconfig.soc"

soc/ti/simplelink/cc13x2_cc26x2/CMakeLists.txt

@@ -4,6 +4,7 @@
 
 zephyr_sources(soc.c)
 zephyr_sources(ccfg.c)
+zephyr_include_directories(.)
 
 if(CONFIG_PM OR CONFIG_PM_DEVICE OR CONFIG_POWEROFF)
   zephyr_library_sources(power.c)

soc/ti/simplelink/cc13x2_cc26x2/Kconfig

@@ -1,25 +1,19 @@
 # Texas Instruments SimpleLink CC13x2 / CC26x2
-
 # Copyright (c) 2019 Brett Witherspoon
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-	prompt "TI SimpleLink MCU Selection"
-	depends on SOC_SERIES_CC13X2_CC26X2
-
-config SOC_CC2652R
-	bool "CC2652R"
-
-config SOC_CC2652P
-	bool "CC2652P"
-
-config SOC_CC1352R
-	bool "CC1352R"
-
-config SOC_CC1352P
-	bool "CC1352P"
-
-endchoice
+config SOC_SERIES_CC13X2_CC26X2
+	select ARM
+	select CPU_CORTEX_M4
+	select CPU_HAS_ARM_MPU
+	select DYNAMIC_INTERRUPTS
+	select CPU_CORTEX_M_HAS_DWT
+	select CPU_HAS_FPU
+	select HAS_CC13X2_CC26X2_SDK
+	select HAS_TI_CCFG if !BOOTLOADER_MCUBOOT
+	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select HAS_PM
+	select HAS_POWEROFF
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2_CC26X2

soc/ti/simplelink/cc13x2_cc26x2/Kconfig.defconfig

@@ -1,15 +1,9 @@
 # Texas Instruments SimpleLink CC13x2 / CC26x2
-
 # Copyright (c) 2019 Brett Witherspoon
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_CC13X2_CC26X2
 
-source "soc/soc_legacy/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc*"
-
-config SOC_SERIES
-	default "cc13x2_cc26x2"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 32768
 

soc/ti/simplelink/cc13x2_cc26x2/Kconfig.soc

@@ -0,0 +1,43 @@
+# Texas Instruments SimpleLink CC13x2 / CC26x2
+
+# Copyright (c) 2019 Brett Witherspoon
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_CC13X2_CC26X2
+	bool
+	select SOC_FAMILY_TI_SIMPLELINK
+	help
+	  Enable support for TI SimpleLink CC13x2 / CC26x2 SoCs
+
+config SOC_CC1352P
+	bool
+	select SOC_SERIES_CC13X2_CC26X2
+	help
+	  CC1352P
+
+config SOC_CC1352R
+	bool
+	select SOC_SERIES_CC13X2_CC26X2
+	help
+	  CC1352R
+
+config SOC_CC2652P
+	bool
+	select SOC_SERIES_CC13X2_CC26X2
+	help
+	  CC2652P
+
+config SOC_CC2652R
+	bool
+	select SOC_SERIES_CC13X2_CC26X2
+	help
+	  CC2652R
+
+config SOC_SERIES
+	default "cc13x2_cc26x2" if SOC_SERIES_CC13X2_CC26X2
+
+config SOC
+	default "cc1352p" if SOC_CC1352P
+	default "cc1352r" if SOC_CC1352R
+	default "cc2652p" if SOC_CC2652P
+	default "cc2652r" if SOC_CC2652R

soc/ti/simplelink/cc13x2x7_cc26x2x7/CMakeLists.txt

@@ -5,6 +5,8 @@
 zephyr_sources(soc.c)
 zephyr_sources(ccfg.c)
 
+zephyr_include_directories(.)
+
 zephyr_library_sources_ifdef(CONFIG_PM    power.c)
 zephyr_library_sources_ifdef(CONFIG_PM_DEVICE   power.c)
 

soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig

@@ -1,25 +1,19 @@
 # Texas Instruments SimpleLink CC13x2 / CC26x2
-
 # Copyright (c) 2022 Vaishnav Achath
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-	prompt "TI SimpleLink MCU Selection"
-	depends on SOC_SERIES_CC13X2X7_CC26X2X7
-
-config SOC_CC2652R7
-	bool "CC2652R7"
-
-config SOC_CC1352R7
-	bool "CC1352R7"
-
-config SOC_CC2652P7
-	bool "CC2652P7"
-
-config SOC_CC1352P7
-	bool "CC1352P7"
-
-endchoice
+config SOC_SERIES_CC13X2X7_CC26X2X7
+	bool
+	select ARM
+	select CPU_CORTEX_M4
+	select CPU_HAS_ARM_MPU
+	select DYNAMIC_INTERRUPTS
+	select CPU_CORTEX_M_HAS_DWT
+	select CPU_HAS_FPU
+	select HAS_CC13X2X7_CC26X2X7_SDK
+	select HAS_TI_CCFG if !BOOTLOADER_MCUBOOT
+	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select HAS_PM
 
 menu "Customer Configuration (CCFG)"
 depends on SOC_SERIES_CC13X2X7_CC26X2X7

soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig.defconfig

@@ -1,15 +1,9 @@
 # Texas Instruments SimpleLink CC13x2 / CC26x2
-
 # Copyright (c) 2022 Vaishnav Achath
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_CC13X2X7_CC26X2X7
 
-source "soc/soc_legacy/arm/ti_simplelink/cc13x2x7_cc26x2x7/Kconfig.defconfig.cc*"
-
-config SOC_SERIES
-	default "cc13x2x7_cc26x2x7"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 32768
 

soc/ti/simplelink/cc13x2x7_cc26x2x7/Kconfig.soc

@@ -0,0 +1,42 @@
+# Texas Instruments SimpleLink CC13x2 / CC26x2
+# Copyright (c) 2022 Vaishnav Achath
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_CC13X2X7_CC26X2X7
+	bool
+	select SOC_FAMILY_TI_SIMPLELINK
+	help
+	  Enable support for TI SimpleLink CC13x2x7 / CC26x2x7 SoCs
+
+config SOC_CC1352P7
+	bool
+	select SOC_SERIES_CC13X2X7_CC26X2X7
+	help
+	  CC1352P7
+
+config SOC_CC1352R7
+	bool
+	select SOC_SERIES_CC13X2X7_CC26X2X7
+	help
+	  CC1352R7
+
+config SOC_CC2652P7
+	bool
+	select SOC_SERIES_CC13X2X7_CC26X2X7
+	help
+	  CC2652P7
+
+config SOC_CC2652R7
+	bool
+	select SOC_SERIES_CC13X2X7_CC26X2X7
+	help
+	  CC2652R7
+
+config SOC_SERIES
+	default "cc13x2x7_cc26x2x7" if SOC_SERIES_CC13X2X7_CC26X2X7
+
+config SOC
+	default "cc1352p7" if SOC_CC1352P7
+	default "cc1352r7" if SOC_CC1352R7
+	default "cc2652p7" if SOC_CC2652P7
+	default "cc2652r7" if SOC_CC2652R7

soc/ti/simplelink/cc32xx/CMakeLists.txt

@@ -3,7 +3,7 @@
 zephyr_sources(soc.c)
 zephyr_include_directories(.)
 
-if (DEFINED CONFIG_CC3220SF_DEBUG OR DEFINED CONFIG_CC3235SF_DEBUG)
+if(DEFINED CONFIG_CC3220SF_DEBUG OR DEFINED CONFIG_CC3235SF_DEBUG)
   zephyr_linker_sources(ROM_START SORT_KEY 0 cc32xx_debug.ld)
 endif()
 

soc/ti/simplelink/cc32xx/Kconfig

@@ -1,21 +1,18 @@
 # Texas Instruments CC32XX
-
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-	prompt "TI SimpleLink MCU Selection"
-	depends on SOC_SERIES_CC32XX
+config SOC_SERIES_CC32XX
+	select ARM
+	select CPU_CORTEX_M4
+	select CPU_CORTEX_M_HAS_DWT
+	select DYNAMIC_INTERRUPTS
 
 config SOC_CC3220SF
-	bool "CC3220SF"
 	select HAS_CC3220SDK
 
 config SOC_CC3235SF
-	bool "CC3235SF"
 	select HAS_CC3220SDK
 
-endchoice
-
 config CC3220SF_DEBUG
 	bool "Prepend debug header, disabling flash verification" if XIP
 	default XIP

soc/ti/simplelink/cc32xx/Kconfig.defconfig

@@ -1,12 +1,8 @@
 # TI SimpleLink Family
-
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_CC32XX
 
-source "soc/soc_legacy/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc32*"
-
-config SOC_SERIES
-	default "cc32xx"
+rsource "Kconfig.defconfig.cc32*"
 
 endif # SOC_SERIES_CC32XX

soc/ti/simplelink/cc32xx/Kconfig.defconfig.cc3220sf

@@ -1,12 +1,8 @@
 # TI SimpleLink CC3220SF SoC
-
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_CC3220SF
 
-config SOC
-	default "cc3220sf"
-
 config NUM_IRQS
 	# must be >= the highest interrupt number used
 	# This includes the NWP interrupt
@@ -20,10 +16,12 @@ config ROM_START_OFFSET
 	default 0x0   if !XIP
 
 if !XIP
+
 config FLASH_SIZE
 	default 0
 config FLASH_BASE_ADDRESS
 	default 0
+
 endif
 
 endif # SOC_CC3220SF

soc/ti/simplelink/cc32xx/Kconfig.defconfig.cc3235sf

@@ -1,13 +1,9 @@
 # TI SimpleLink CC3235SF SoC
-
 # Copyright (c) 2019, Texas Instruments Incorporated
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_CC3235SF
 
-config SOC
-	default "cc3235sf"
-
 config NUM_IRQS
 	# must be >= the highest interrupt number used
 	# This includes the NWP interrupt
@@ -21,10 +17,12 @@ config ROM_START_OFFSET
 	default 0x0   if !XIP
 
 if !XIP
+
 config FLASH_SIZE
 	default 0
 config FLASH_BASE_ADDRESS
 	default 0
+
 endif
 
 endif # SOC_CC3235SF

soc/ti/simplelink/cc32xx/Kconfig.soc

@@ -0,0 +1,27 @@
+# TI SimpleLink CC32xx
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_CC32XX
+	bool
+	select SOC_FAMILY_TI_SIMPLELINK
+	help
+	  Enable support for TI SimpleLink CC32xx
+
+config SOC_CC3220SF
+	bool
+	select SOC_SERIES_CC32XX
+	help
+	  CC3220SF
+
+config SOC_CC3235SF
+	bool
+	select SOC_SERIES_CC32XX
+	help
+	  CC3235SF
+
+config SOC_SERIES
+	default "cc32xx" if SOC_SERIES_CC32XX
+
+config SOC
+	default "cc3220sf" if SOC_CC3220SF
+	default "cc3235sf" if SOC_CC3235SF

soc/ti/simplelink/msp432p4xx/CMakeLists.txt

@@ -2,5 +2,6 @@
 
 zephyr_compile_definitions(-D__MSP432P401R__)
 zephyr_sources(soc.c)
+zephyr_include_directories(.)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/ti/simplelink/msp432p4xx/Kconfig

@@ -1,16 +1,14 @@
-# TI SimpleLink MSP432P4XX
-
+# Texas Instruments MSP432P401R
 # Copyright (c) 2017, Linaro Ltd
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_MSP432P4XX
-	bool "TI SimpleLink Family MSP432P4XX"
 	select ARM
 	select CPU_CORTEX_M4
 	select CPU_CORTEX_M_HAS_DWT
 	select DYNAMIC_INTERRUPTS
-	select SOC_FAMILY_TISIMPLELINK
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
-	help
-	  Enable support for TI SimpleLink MSP432P4XX.
+
+config SOC_MSP432P401R
+	select HAS_MSP432P4XXSDK

soc/ti/simplelink/msp432p4xx/Kconfig.defconfig

@@ -1,13 +1,9 @@
 # TI SimpleLink MSP432P4XX
-
 # Copyright (c) 2017, Linaro Ltd
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_MSP432P4XX
 
-source "soc/soc_legacy/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p4*"
-
-config SOC_SERIES
-	default "msp432p4xx"
+rsource "Kconfig.defconfig.msp432p4*"
 
 endif # SOC_SERIES_MSP432P4XX

soc/ti/simplelink/msp432p4xx/Kconfig.defconfig.msp432p401r

@@ -1,13 +1,9 @@
 # TI SimpleLink MSP432P401R SoC
-
 # Copyright (c) 2017, Linaro Ltd
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_MSP432P401R
 
-config SOC
-	default "msp432p401r"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 48000000
 

soc/ti/simplelink/msp432p4xx/Kconfig.soc

@@ -0,0 +1,21 @@
+# Texas Instruments MSP432P401R
+# Copyright (c) 2017, Linaro Ltd
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_MSP432P4XX
+	bool
+	select SOC_FAMILY_TI_SIMPLELINK
+	help
+	  Enable support for TI SimpleLink MSP432P4XX.
+
+config SOC_MSP432P401R
+	bool
+	select SOC_SERIES_MSP432P4XX
+	help
+	  MSP432P401R
+
+config SOC_SERIES
+	default "msp432p4xx" if SOC_SERIES_MSP432P4XX
+
+config SOC
+	default "msp432p401r" if SOC_MSP432P401R

soc/ti/simplelink/soc.yml

@@ -0,0 +1,19 @@
+family:
+- name: ti_simplelink
+  series:
+  - name: cc13x2_cc26x2
+    socs:
+    - name: cc1352p
+    - name: cc1352r
+    - name: cc2652p
+    - name: cc2652r
+  - name: cc13x2x7_cc26x2x7
+    socs:
+    - name: cc1352p7
+    - name: cc1352r7
+    - name: cc2652p7
+    - name: cc2652r7
+  - name: cc32xx
+    socs:
+    - name: cc3220sf
+    - name: cc3235sf