diff --git a/soc/arm/quicklogic_eos_s3/CMakeLists.txt b/soc/v2/quicklogic/eos_s3/CMakeLists.txt similarity index 87% rename from soc/arm/quicklogic_eos_s3/CMakeLists.txt rename to soc/v2/quicklogic/eos_s3/CMakeLists.txt index 224b298c409..5c821692a4b 100644 --- a/soc/arm/quicklogic_eos_s3/CMakeLists.txt +++ b/soc/v2/quicklogic/eos_s3/CMakeLists.txt @@ -5,4 +5,6 @@ zephyr_sources( soc.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/arm/quicklogic_eos_s3/Kconfig.soc b/soc/v2/quicklogic/eos_s3/Kconfig similarity index 88% rename from soc/arm/quicklogic_eos_s3/Kconfig.soc rename to soc/v2/quicklogic/eos_s3/Kconfig index e555933430b..e294a432778 100644 --- a/soc/arm/quicklogic_eos_s3/Kconfig.soc +++ b/soc/v2/quicklogic/eos_s3/Kconfig @@ -2,7 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_EOS_S3 - bool "QuickLogic EOS S3 SoC" select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_SYSTICK diff --git a/soc/arm/quicklogic_eos_s3/Kconfig.defconfig b/soc/v2/quicklogic/eos_s3/Kconfig.defconfig similarity index 86% rename from soc/arm/quicklogic_eos_s3/Kconfig.defconfig rename to soc/v2/quicklogic/eos_s3/Kconfig.defconfig index d09a30ca53e..2d4f48b45e3 100644 --- a/soc/arm/quicklogic_eos_s3/Kconfig.defconfig +++ b/soc/v2/quicklogic/eos_s3/Kconfig.defconfig @@ -3,9 +3,6 @@ if SOC_EOS_S3 -config SOC - default "quicklogic_eos_s3" - config NUM_IRQS default 52 diff --git a/soc/arm/quicklogic_eos_s3/Kconfig b/soc/v2/quicklogic/eos_s3/Kconfig.soc similarity index 56% rename from soc/arm/quicklogic_eos_s3/Kconfig rename to soc/v2/quicklogic/eos_s3/Kconfig.soc index d2f7c006428..0f762d3927e 100644 --- a/soc/arm/quicklogic_eos_s3/Kconfig +++ b/soc/v2/quicklogic/eos_s3/Kconfig.soc @@ -3,3 +3,8 @@ config SOC_EOS_S3 bool + help + QuickLogic EOS S3 SoC + +config SOC + default "quicklogic_eos_s3" if SOC_EOS_S3 diff --git a/soc/arm/quicklogic_eos_s3/pinctrl_soc.h b/soc/v2/quicklogic/eos_s3/pinctrl_soc.h similarity index 100% rename from soc/arm/quicklogic_eos_s3/pinctrl_soc.h rename to soc/v2/quicklogic/eos_s3/pinctrl_soc.h diff --git a/soc/arm/quicklogic_eos_s3/soc.c b/soc/v2/quicklogic/eos_s3/soc.c similarity index 100% rename from soc/arm/quicklogic_eos_s3/soc.c rename to soc/v2/quicklogic/eos_s3/soc.c diff --git a/soc/arm/quicklogic_eos_s3/soc.h b/soc/v2/quicklogic/eos_s3/soc.h similarity index 100% rename from soc/arm/quicklogic_eos_s3/soc.h rename to soc/v2/quicklogic/eos_s3/soc.h diff --git a/soc/v2/quicklogic/eos_s3/soc.yml b/soc/v2/quicklogic/eos_s3/soc.yml new file mode 100644 index 00000000000..6a217341807 --- /dev/null +++ b/soc/v2/quicklogic/eos_s3/soc.yml @@ -0,0 +1,2 @@ +socs: + - name: quicklogic_eos_s3 diff --git a/soc/arm/quicklogic_eos_s3/soc_pinmap.h b/soc/v2/quicklogic/eos_s3/soc_pinmap.h similarity index 100% rename from soc/arm/quicklogic_eos_s3/soc_pinmap.h rename to soc/v2/quicklogic/eos_s3/soc_pinmap.h