diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/CMakeLists.txt b/soc/soc_legacy/riscv/starfive_jh71xx/CMakeLists.txt deleted file mode 100644 index 69b2926358e..00000000000 --- a/soc/soc_legacy/riscv/starfive_jh71xx/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -add_subdirectory(${SOC_SERIES}) diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig b/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig deleted file mode 100644 index 155339112de..00000000000 --- a/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config SOC_FAMILY_STARFIVE_JH71XX - bool - -if SOC_FAMILY_STARFIVE_JH71XX - -config SOC_FAMILY - string - default "starfive_jh71xx" - -source "soc/soc_legacy/riscv/starfive_jh71xx/*/Kconfig.soc" - -endif # SOC_FAMILY_STARFIVE_JH71XX diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig.defconfig b/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig.defconfig deleted file mode 100644 index 0bf2e484318..00000000000 --- a/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig.defconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -source "soc/soc_legacy/riscv/starfive_jh71xx/*/Kconfig.defconfig.series" diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig.soc b/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig.soc deleted file mode 100644 index 3a3d413e854..00000000000 --- a/soc/soc_legacy/riscv/starfive_jh71xx/Kconfig.soc +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -source "soc/soc_legacy/riscv/starfive_jh71xx/*/Kconfig.series" diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.jh7100 b/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.jh7100 deleted file mode 100644 index 6f38d61dd4e..00000000000 --- a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.jh7100 +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config SOC - default "jh7100" if SOC_JH7100 diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.series b/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.series deleted file mode 100644 index f392a5d1f97..00000000000 --- a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.series +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 Rajnesh Kanwal -# SPDX-License-Identifier: Apache-2.0 - -config SOC_SERIES_STARFIVE_JH71XX - bool "Starfive JH71XX series" - select RISCV - select RISCV_PRIVILEGED - select RISCV_HAS_PLIC - help - Enable support for Starfive JH71XX SoC Series. diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/CMakeLists.txt b/soc/starfive/jh71xx/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/CMakeLists.txt rename to soc/starfive/jh71xx/CMakeLists.txt diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.soc b/soc/starfive/jh71xx/Kconfig similarity index 75% rename from soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.soc rename to soc/starfive/jh71xx/Kconfig index 8be7ebe5dbe..91ef208f9c1 100644 --- a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.soc +++ b/soc/starfive/jh71xx/Kconfig @@ -1,12 +1,12 @@ # Copyright (c) 2021 Rajnesh Kanwal # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Starfive JH7100 SoC" - depends on SOC_SERIES_STARFIVE_JH71XX +config SOC_SERIES_STARFIVE_JH71XX + select RISCV + select RISCV_PRIVILEGED + select RISCV_HAS_PLIC config SOC_JH7100 - bool "Starfive JH7100" select ATOMIC_OPERATIONS_BUILTIN select INCLUDE_RESET_VECTOR select RISCV_ISA_RV64I @@ -15,5 +15,3 @@ config SOC_JH7100 select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice diff --git a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.series b/soc/starfive/jh71xx/Kconfig.defconfig similarity index 76% rename from soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.series rename to soc/starfive/jh71xx/Kconfig.defconfig index 998f1b3fdae..c20bde5ee58 100644 --- a/soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.series +++ b/soc/starfive/jh71xx/Kconfig.defconfig @@ -3,9 +3,6 @@ if SOC_SERIES_STARFIVE_JH71XX -config SOC_SERIES - default "jh71xx" - config SYS_CLOCK_HW_CYCLES_PER_SEC default 6250000 @@ -24,6 +21,4 @@ config 2ND_LVL_INTR_00_OFFSET config NUM_IRQS default 139 -source "soc/soc_legacy/riscv/starfive_jh71xx/jh71xx/Kconfig.defconfig.jh71*" - endif diff --git a/soc/starfive/jh71xx/Kconfig.soc b/soc/starfive/jh71xx/Kconfig.soc new file mode 100644 index 00000000000..48d6d506cc9 --- /dev/null +++ b/soc/starfive/jh71xx/Kconfig.soc @@ -0,0 +1,19 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STARFIVE_JH71XX + bool + help + Starfive JH71XX series + +config SOC_JH7100 + bool + select SOC_SERIES_STARFIVE_JH71XX + help + Starfive JH7100 + +config SOC_SERIES + default "starfive_jh71xx" if SOC_SERIES_STARFIVE_JH71XX + +config SOC + default "jh7100" if SOC_JH7100 diff --git a/soc/starfive/jh71xx/soc.yml b/soc/starfive/jh71xx/soc.yml new file mode 100644 index 00000000000..1d424c2f540 --- /dev/null +++ b/soc/starfive/jh71xx/soc.yml @@ -0,0 +1,4 @@ +series: +- name: starfive_jh71xx + socs: + - name: jh7100