diff --git a/soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig b/soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig deleted file mode 100644 index 57b18d27830..00000000000 --- a/soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2014 Wind River Systems, Inc. -# Copyright (c) 2018 Synopsys, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -if SOC_EMSK - -config SOC - default "snps_emsk" - -source "soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em7d" -source "soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em11d" -source "soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em9d" - -endif # SOC_EMSK diff --git a/soc/soc_legacy/arc/snps_emsk/CMakeLists.txt b/soc/synopsys/emsk/CMakeLists.txt similarity index 70% rename from soc/soc_legacy/arc/snps_emsk/CMakeLists.txt rename to soc/synopsys/emsk/CMakeLists.txt index 8e8ef5865ca..ea14ab053c8 100644 --- a/soc/soc_legacy/arc/snps_emsk/CMakeLists.txt +++ b/soc/synopsys/emsk/CMakeLists.txt @@ -2,9 +2,9 @@ zephyr_compile_options(-mcpu=${GCC_M_CPU} -mno-sdata -mmpy-option=6) if(CONFIG_SOC_EMSK_EM9D) -zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpus_all) + zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpus_all) elseif(CONFIG_SOC_EMSK_EM11D) -zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpuda_all) + zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpuda_all) endif() zephyr_sources(soc_config.c) diff --git a/soc/soc_legacy/arc/snps_emsk/Kconfig b/soc/synopsys/emsk/Kconfig similarity index 56% rename from soc/soc_legacy/arc/snps_emsk/Kconfig rename to soc/synopsys/emsk/Kconfig index b1f0f7e54aa..88cdfe70671 100644 --- a/soc/soc_legacy/arc/snps_emsk/Kconfig +++ b/soc/synopsys/emsk/Kconfig @@ -2,21 +2,14 @@ # Copyright (c) 2018 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARC EM Starter Kit Core Selection" - default SOC_EMSK_EM7D - depends on SOC_EMSK +config SOC_EMSK + select ARC config SOC_EMSK_EM7D - bool "Synopsys ARC EM7D of EMSK" select CPU_HAS_MPU -config SOC_EMSK_EM11D - bool "Synopsys ARC EM11D of EMSK" - select CPU_HAS_FPU - config SOC_EMSK_EM9D - bool "Synopsys ARC EM9D of EMSK" select CPU_HAS_FPU -endchoice +config SOC_EMSK_EM11D + select CPU_HAS_FPU diff --git a/soc/soc_legacy/arc/snps_emsk/Kconfig.soc b/soc/synopsys/emsk/Kconfig.defconfig similarity index 67% rename from soc/soc_legacy/arc/snps_emsk/Kconfig.soc rename to soc/synopsys/emsk/Kconfig.defconfig index d172c4144a7..e7f231ebcf2 100644 --- a/soc/soc_legacy/arc/snps_emsk/Kconfig.soc +++ b/soc/synopsys/emsk/Kconfig.defconfig @@ -2,6 +2,8 @@ # Copyright (c) 2018 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -config SOC_EMSK - bool "Synopsys ARC EM Starter Kit SoC" - select ARC +if SOC_EMSK + +rsource "Kconfig.defconfig.*" + +endif # SOC_EMSK diff --git a/soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em11d b/soc/synopsys/emsk/Kconfig.defconfig.em11d similarity index 100% rename from soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em11d rename to soc/synopsys/emsk/Kconfig.defconfig.em11d diff --git a/soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em7d b/soc/synopsys/emsk/Kconfig.defconfig.em7d similarity index 100% rename from soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em7d rename to soc/synopsys/emsk/Kconfig.defconfig.em7d diff --git a/soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em9d b/soc/synopsys/emsk/Kconfig.defconfig.em9d similarity index 100% rename from soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em9d rename to soc/synopsys/emsk/Kconfig.defconfig.em9d diff --git a/soc/synopsys/emsk/Kconfig.soc b/soc/synopsys/emsk/Kconfig.soc new file mode 100644 index 00000000000..d74e73ddc89 --- /dev/null +++ b/soc/synopsys/emsk/Kconfig.soc @@ -0,0 +1,34 @@ +# Copyright (c) 2014 Wind River Systems, Inc. +# Copyright (c) 2018 Synopsys, Inc. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +config SOC_EMSK + bool + help + Synopsys ARC EM Starter Kit SoC + +config SOC_EMSK_EM7D + bool + select SOC_EMSK + help + Synopsys ARC EM7D of EMSK + +config SOC_EMSK_EM9D + bool + select SOC_EMSK + help + Synopsys ARC EM9D of EMSK + +config SOC_EMSK_EM11D + bool + select SOC_EMSK + help + Synopsys ARC EM11D of EMSK + +config SOC_SERIES + default "emsk" if SOC_EMSK + +config SOC + default "emsk_em7d" if SOC_EMSK_EM7D + default "emsk_em9d" if SOC_EMSK_EM9D + default "emsk_em11d" if SOC_EMSK_EM11D diff --git a/soc/soc_legacy/arc/snps_emsk/linker.ld b/soc/synopsys/emsk/linker.ld similarity index 100% rename from soc/soc_legacy/arc/snps_emsk/linker.ld rename to soc/synopsys/emsk/linker.ld diff --git a/soc/synopsys/emsk/soc.yml b/soc/synopsys/emsk/soc.yml new file mode 100644 index 00000000000..43623616a49 --- /dev/null +++ b/soc/synopsys/emsk/soc.yml @@ -0,0 +1,6 @@ +series: +- name: emsk + socs: + - name: emsk_em7d + - name: emsk_em9d + - name: emsk_em11d diff --git a/soc/soc_legacy/arc/snps_emsk/soc_config.c b/soc/synopsys/emsk/soc_config.c similarity index 100% rename from soc/soc_legacy/arc/snps_emsk/soc_config.c rename to soc/synopsys/emsk/soc_config.c