diff --git a/soc/soc_legacy/arm/arm/designstart/CMakeLists.txt b/soc/arm/designstart/CMakeLists.txt similarity index 82% rename from soc/soc_legacy/arm/arm/designstart/CMakeLists.txt rename to soc/arm/designstart/CMakeLists.txt index 5d2598e239b..f5ca7d6435e 100644 --- a/soc/soc_legacy/arm/arm/designstart/CMakeLists.txt +++ b/soc/arm/designstart/CMakeLists.txt @@ -1,3 +1,5 @@ # 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 "") diff --git a/soc/soc_legacy/arm/arm/designstart/Kconfig.soc b/soc/arm/designstart/Kconfig similarity index 67% rename from soc/soc_legacy/arm/arm/designstart/Kconfig.soc rename to soc/arm/designstart/Kconfig index 00ce3c7a4eb..c25f3a2bb66 100644 --- a/soc/soc_legacy/arm/arm/designstart/Kconfig.soc +++ b/soc/arm/designstart/Kconfig @@ -1,20 +1,15 @@ # Copyright (c) 2020 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM DesignStart SoCs" - depends on SOC_SERIES_ARM_DESIGNSTART +config SOC_SERIES_ARM_DESIGNSTART + select ARM config SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 - bool "ARM Cortex-M1 DesignStart FPGA" select CPU_CORTEX_M1 imply XIP select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE config SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 - bool "ARM Cortex-M3 DesignStart FPGA" select CPU_CORTEX_M3 imply XIP select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE - -endchoice diff --git a/soc/arm/designstart/Kconfig.soc b/soc/arm/designstart/Kconfig.soc new file mode 100644 index 00000000000..db860bebbc9 --- /dev/null +++ b/soc/arm/designstart/Kconfig.soc @@ -0,0 +1,27 @@ +# Copyright (c) 2020 Henrik Brix Andersen +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_ARM_DESIGNSTART + bool + select SOC_FAMILY_ARM + help + ARM DesignStart SoC Series + +config SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 + bool + select SOC_SERIES_ARM_DESIGNSTART + help + ARM Cortex-M1 DesignStart FPGA + +config SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 + bool + select SOC_SERIES_ARM_DESIGNSTART + help + ARM Cortex-M3 DesignStart FPGA + +config SOC_SERIES + default "designstart" if SOC_SERIES_ARM_DESIGNSTART + +config SOC + default "designstart_fpga_cortex_m1" if SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 + default "designstart_fpga_cortex_m3" if SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 diff --git a/soc/soc_legacy/arm/arm/designstart/soc.h b/soc/arm/designstart/soc.h similarity index 100% rename from soc/soc_legacy/arm/arm/designstart/soc.h rename to soc/arm/designstart/soc.h diff --git a/soc/arm/soc.yml b/soc/arm/soc.yml index fcafabb1586..c0b2456501e 100644 --- a/soc/arm/soc.yml +++ b/soc/arm/soc.yml @@ -15,6 +15,10 @@ family: socs: - name: musca_b1 - name: musca_s1 + - name: designstart + socs: + - name: designstart_fpga_cortex_m1 + - name: designstart_fpga_cortex_m3 - name: arm64 series: - name: fvp_aemv8a diff --git a/soc/soc_legacy/arm/arm/CMakeLists.txt b/soc/soc_legacy/arm/arm/CMakeLists.txt deleted file mode 100644 index 226f3bd626f..00000000000 --- a/soc/soc_legacy/arm/arm/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -add_subdirectory(${SOC_SERIES}) diff --git a/soc/soc_legacy/arm/arm/Kconfig b/soc/soc_legacy/arm/arm/Kconfig deleted file mode 100644 index 6d01023ab70..00000000000 --- a/soc/soc_legacy/arm/arm/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# ARM LTD SoC configuration options - -# Copyright (c) 2016 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config SOC_FAMILY_ARM - bool - -if SOC_FAMILY_ARM -config SOC_FAMILY - string - default "arm" - -source "soc/soc_legacy/arm/arm/*/Kconfig.soc" -endif # SOC_FAMILY_ARM diff --git a/soc/soc_legacy/arm/arm/Kconfig.defconfig b/soc/soc_legacy/arm/arm/Kconfig.defconfig deleted file mode 100644 index fcc56b70cd1..00000000000 --- a/soc/soc_legacy/arm/arm/Kconfig.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# ARM LTD SoC configuration options - -# Copyright (c) 2016 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -source "soc/soc_legacy/arm/arm/*/Kconfig.defconfig.series" diff --git a/soc/soc_legacy/arm/arm/Kconfig.soc b/soc/soc_legacy/arm/arm/Kconfig.soc deleted file mode 100644 index 47f97568354..00000000000 --- a/soc/soc_legacy/arm/arm/Kconfig.soc +++ /dev/null @@ -1,6 +0,0 @@ -# ARM LTD SoC configuration options - -# Copyright (c) 2016 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -source "soc/soc_legacy/arm/arm/*/Kconfig.series" diff --git a/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex_m1 b/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex_m1 deleted file mode 100644 index 8c6052ffa2d..00000000000 --- a/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex_m1 +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2020 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 - -config SOC - default "designstart_cortex_m1" - -endif # SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 diff --git a/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex_m3 b/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex_m3 deleted file mode 100644 index 49275b57afe..00000000000 --- a/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex_m3 +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2020 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 - -config SOC - default "designstart_cortex_m3" - -endif # SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 diff --git a/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.series b/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.series deleted file mode 100644 index ce8a980a700..00000000000 --- a/soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.series +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2020 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if SOC_SERIES_ARM_DESIGNSTART - -config SOC_SERIES - default "designstart" - -source "soc/soc_legacy/arm/arm/designstart/Kconfig.defconfig.cortex*" - -endif # SOC_SERIES_ARM_DESIGNSTART diff --git a/soc/soc_legacy/arm/arm/designstart/Kconfig.series b/soc/soc_legacy/arm/arm/designstart/Kconfig.series deleted file mode 100644 index 23c49edc8c6..00000000000 --- a/soc/soc_legacy/arm/arm/designstart/Kconfig.series +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2020 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config SOC_SERIES_ARM_DESIGNSTART - bool "Arm DesignStart SoC Series" - select ARM - select SOC_FAMILY_ARM - help - Enable support for the ARM DesignStart SoC Series