diff --git a/soc/soc_legacy/arm/arm/beetle/CMSDK_BEETLE.h b/soc/arm/beetle/CMSDK_BEETLE.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/CMSDK_BEETLE.h rename to soc/arm/beetle/CMSDK_BEETLE.h diff --git a/soc/soc_legacy/arm/arm/beetle/CMakeLists.txt b/soc/arm/beetle/CMakeLists.txt similarity index 85% rename from soc/soc_legacy/arm/arm/beetle/CMakeLists.txt rename to soc/arm/beetle/CMakeLists.txt index e911f5faab5..7cad91bdc85 100644 --- a/soc/soc_legacy/arm/arm/beetle/CMakeLists.txt +++ b/soc/arm/beetle/CMakeLists.txt @@ -5,4 +5,6 @@ zephyr_sources( power.c ) +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/beetle/Kconfig.series b/soc/arm/beetle/Kconfig similarity index 70% rename from soc/soc_legacy/arm/arm/beetle/Kconfig.series rename to soc/arm/beetle/Kconfig index 2217f282cf0..19de2b1717c 100644 --- a/soc/soc_legacy/arm/arm/beetle/Kconfig.series +++ b/soc/arm/beetle/Kconfig @@ -4,11 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_BEETLE - bool "Arm Beetle MCU Series" select ARM select CPU_CORTEX_M3 - select SOC_FAMILY_ARM select CPU_HAS_ARM_MPU select CPU_CORTEX_M_HAS_DWT - help - Enable support for Beetle MCU Series diff --git a/soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.series b/soc/arm/beetle/Kconfig.defconfig similarity index 75% rename from soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.series rename to soc/arm/beetle/Kconfig.defconfig index 9d6afb95f88..4052632978b 100644 --- a/soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.series +++ b/soc/arm/beetle/Kconfig.defconfig @@ -5,11 +5,6 @@ if SOC_SERIES_BEETLE -source "soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.beetle*" - -config SOC_SERIES - default "beetle" - config NUM_IRQS default 45 diff --git a/soc/arm/beetle/Kconfig.soc b/soc/arm/beetle/Kconfig.soc new file mode 100644 index 00000000000..9b28a76106b --- /dev/null +++ b/soc/arm/beetle/Kconfig.soc @@ -0,0 +1,22 @@ +# ARM LTD Beetle SoC configuration options + +# Copyright (c) 2016 Linaro Limited +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_BEETLE + bool + select SOC_FAMILY_ARM + help + Enable support for Beetle MCU Series + +config SOC_BEETLE_R0 + bool + select SOC_SERIES_BEETLE + help + ARM BEETLE R0 + +config SOC_SERIES + default "beetle" if SOC_SERIES_BEETLE + +config SOC + default "beetle_r0" if SOC_BEETLE_R0 diff --git a/soc/soc_legacy/arm/arm/beetle/power.c b/soc/arm/beetle/power.c similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/power.c rename to soc/arm/beetle/power.c diff --git a/soc/soc_legacy/arm/arm/beetle/soc.c b/soc/arm/beetle/soc.c similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc.c rename to soc/arm/beetle/soc.c diff --git a/soc/soc_legacy/arm/arm/beetle/soc.h b/soc/arm/beetle/soc.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc.h rename to soc/arm/beetle/soc.h diff --git a/soc/arm/beetle/soc.yml b/soc/arm/beetle/soc.yml new file mode 100644 index 00000000000..20bbf8445fd --- /dev/null +++ b/soc/arm/beetle/soc.yml @@ -0,0 +1,4 @@ +series: +- name: beetle + socs: + - name: beetle_r0 diff --git a/soc/soc_legacy/arm/arm/beetle/soc_irq.h b/soc/arm/beetle/soc_irq.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc_irq.h rename to soc/arm/beetle/soc_irq.h diff --git a/soc/soc_legacy/arm/arm/beetle/soc_pins.h b/soc/arm/beetle/soc_pins.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc_pins.h rename to soc/arm/beetle/soc_pins.h diff --git a/soc/soc_legacy/arm/arm/beetle/soc_pll.h b/soc/arm/beetle/soc_pll.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc_pll.h rename to soc/arm/beetle/soc_pll.h diff --git a/soc/soc_legacy/arm/arm/beetle/soc_power.h b/soc/arm/beetle/soc_power.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc_power.h rename to soc/arm/beetle/soc_power.h diff --git a/soc/soc_legacy/arm/arm/beetle/soc_registers.h b/soc/arm/beetle/soc_registers.h similarity index 100% rename from soc/soc_legacy/arm/arm/beetle/soc_registers.h rename to soc/arm/beetle/soc_registers.h diff --git a/soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.beetle_r0 b/soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.beetle_r0 deleted file mode 100644 index ae6d93ca0cc..00000000000 --- a/soc/soc_legacy/arm/arm/beetle/Kconfig.defconfig.beetle_r0 +++ /dev/null @@ -1,8 +0,0 @@ -# ARM LTD Beetle SoC configuration options - -# Copyright (c) 2016 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config SOC - default "beetle_r0" - depends on SOC_BEETLE_R0 diff --git a/soc/soc_legacy/arm/arm/beetle/Kconfig.soc b/soc/soc_legacy/arm/arm/beetle/Kconfig.soc deleted file mode 100644 index e577ee7060e..00000000000 --- a/soc/soc_legacy/arm/arm/beetle/Kconfig.soc +++ /dev/null @@ -1,13 +0,0 @@ -# ARM LTD Beetle SoC configuration options - -# Copyright (c) 2016 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "ARM Beetle SoC" - depends on SOC_SERIES_BEETLE - -config SOC_BEETLE_R0 - bool "ARM BEETLE R0" - -endchoice