From ca214745a1ae5cdc984eac648941c26344583c5c Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 1 Mar 2024 19:03:21 +0000 Subject: [PATCH] soc: Remove soc_legacy folder and move ARM Kconfig Removes the soc_legacy folder which is left over from the transition to hwmv2 and moves the Kconfig for ARM to arch Signed-off-by: Jamie McCrae --- arch/arm/Kconfig | 43 ++++++++++++++++++++++ soc/soc_legacy/arm/CMakeLists.txt | 7 ---- soc/soc_legacy/arm/Kconfig | 53 ---------------------------- soc/soc_legacy/riscv/CMakeLists.txt | 7 ---- soc/soc_legacy/xtensa/CMakeLists.txt | 7 ---- 5 files changed, 43 insertions(+), 74 deletions(-) delete mode 100644 soc/soc_legacy/arm/CMakeLists.txt delete mode 100644 soc/soc_legacy/arm/Kconfig delete mode 100644 soc/soc_legacy/riscv/CMakeLists.txt delete mode 100644 soc/soc_legacy/xtensa/CMakeLists.txt diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8b0d53ec3cf2031..3f5f3075777fc82 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -82,4 +82,47 @@ config ARM_ON_EXIT_CPU_IDLE rsource "core/Kconfig" rsource "core/Kconfig.vfp" +# General options signifying CPU capabilities of ARM SoCs +config CPU_HAS_ARM_MPU + bool + select CPU_HAS_MPU + help + This option is enabled when the CPU has a Memory Protection Unit (MPU) + in ARM flavor. + +config CPU_HAS_NXP_MPU + bool + select CPU_HAS_MPU + help + This option is enabled when the CPU has a Memory Protection Unit (MPU) + in NXP flavor. + +config CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS + bool "Custom fixed SoC MPU region definition" + help + If enabled, this option signifies that the SoC will + define and configure its own fixed MPU regions in the + SoC definition. These fixed MPU regions are currently + used to set Flash and SRAM default access policies and + they are programmed at boot time. + +config CPU_HAS_ARM_SAU + bool + select CPU_HAS_TEE + help + MCU implements the ARM Security Attribution Unit (SAU). + +config CPU_HAS_NRF_IDAU + bool + select CPU_HAS_TEE + help + MCU implements the nRF (vendor-specific) Security Attribution Unit. + (IDAU: "Implementation-Defined Attribution Unit", in accordance with + ARM terminology). + +config HAS_SWO + bool + help + When enabled, indicates that SoC has an SWO output + endmenu diff --git a/soc/soc_legacy/arm/CMakeLists.txt b/soc/soc_legacy/arm/CMakeLists.txt deleted file mode 100644 index b826da926caf128..000000000000000 --- a/soc/soc_legacy/arm/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -if(SOC_FAMILY) - add_subdirectory(${SOC_FAMILY}) -else() - add_subdirectory(${SOC_NAME}) -endif() diff --git a/soc/soc_legacy/arm/Kconfig b/soc/soc_legacy/arm/Kconfig deleted file mode 100644 index 461f0b41f84c0f8..000000000000000 --- a/soc/soc_legacy/arm/Kconfig +++ /dev/null @@ -1,53 +0,0 @@ -# General options signifying CPU capabilities of ARM SoCs - -# Copyright (c) 2018 Nordic Semiconductor ASA. -# SPDX-License-Identifier: Apache-2.0 - -config CPU_HAS_ARM_MPU - bool - select CPU_HAS_MPU - help - This option is enabled when the CPU has a Memory Protection Unit (MPU) - in ARM flavor. - -config CPU_HAS_NXP_MPU - bool - select CPU_HAS_MPU - help - This option is enabled when the CPU has a Memory Protection Unit (MPU) - in NXP flavor. - -config CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS - bool "Custom fixed SoC MPU region definition" - help - If enabled, this option signifies that the SoC will - define and configure its own fixed MPU regions in the - SoC definition. These fixed MPU regions are currently - used to set Flash and SRAM default access policies and - they are programmed at boot time. - -config CPU_HAS_ARM_SAU - bool - select CPU_HAS_TEE - help - MCU implements the ARM Security Attribution Unit (SAU). - -config CPU_HAS_NRF_IDAU - bool - select CPU_HAS_TEE - help - MCU implements the nRF (vendor-specific) Security Attribution Unit. - (IDAU: "Implementation-Defined Attribution Unit", in accordance with - ARM terminology). - -config HAS_SWO - bool - help - When enabled, indicates that SoC has an SWO output - -config SOC_PART_NUMBER - string - 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. diff --git a/soc/soc_legacy/riscv/CMakeLists.txt b/soc/soc_legacy/riscv/CMakeLists.txt deleted file mode 100644 index b826da926caf128..000000000000000 --- a/soc/soc_legacy/riscv/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -if(SOC_FAMILY) - add_subdirectory(${SOC_FAMILY}) -else() - add_subdirectory(${SOC_NAME}) -endif() diff --git a/soc/soc_legacy/xtensa/CMakeLists.txt b/soc/soc_legacy/xtensa/CMakeLists.txt deleted file mode 100644 index b826da926caf128..000000000000000 --- a/soc/soc_legacy/xtensa/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -if(SOC_FAMILY) - add_subdirectory(${SOC_FAMILY}) -else() - add_subdirectory(${SOC_NAME}) -endif()