diff --git a/soc/arm64/rockchip/rk3568/CMakeLists.txt b/soc/arm64/rockchip/rk3568/CMakeLists.txt deleted file mode 100644 index 2cf9a407f84..00000000000 --- a/soc/arm64/rockchip/rk3568/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -zephyr_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c) diff --git a/soc/arm64/rockchip/rk3568/Kconfig.series b/soc/arm64/rockchip/rk3568/Kconfig.series deleted file mode 100644 index 15909e5bff0..00000000000 --- a/soc/arm64/rockchip/rk3568/Kconfig.series +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2022 HNU-ESNL -# Copyright 2022 openEuler SIG-Zephyrs -# SPDX-License-Identifier: Apache-2.0 - -config SOC_SERIES_RK3568 - bool "Rockchip RK3568 Series" - select ARM64 - select SOC_FAMILY_ROCKCHIP - help - Enable support for RK3568 Series. diff --git a/soc/arm64/rockchip/rk3568/linker.ld b/soc/arm64/rockchip/rk3568/linker.ld deleted file mode 100644 index f1b07809e1f..00000000000 --- a/soc/arm64/rockchip/rk3568/linker.ld +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright 2020 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include diff --git a/soc/v2/rockchip/CMakeLists.txt b/soc/v2/rockchip/CMakeLists.txt new file mode 100644 index 00000000000..5e343b6e266 --- /dev/null +++ b/soc/v2/rockchip/CMakeLists.txt @@ -0,0 +1,7 @@ +# +# Copyright 2021 Huawei France Technologies SASU +# +# SPDX-License-Identifier: Apache-2.0 +# + +add_subdirectory(${SOC_SERIES}) diff --git a/soc/v2/rockchip/Kconfig b/soc/v2/rockchip/Kconfig new file mode 100644 index 00000000000..ef15f6f4ef0 --- /dev/null +++ b/soc/v2/rockchip/Kconfig @@ -0,0 +1,7 @@ +# +# Copyright 2021 Huawei France Technologies SASU +# +# SPDX-License-Identifier: Apache-2.0 +# + +rsource "*/Kconfig" diff --git a/soc/v2/rockchip/Kconfig.defconfig b/soc/v2/rockchip/Kconfig.defconfig new file mode 100644 index 00000000000..122e92dc999 --- /dev/null +++ b/soc/v2/rockchip/Kconfig.defconfig @@ -0,0 +1,11 @@ +# +# Copyright 2021 Huawei France Technologies SASU +# +# SPDX-License-Identifier: Apache-2.0 +# + +if SOC_FAMILY_ROCKCHIP + +rsource "*/Kconfig.defconfig" + +endif diff --git a/soc/v2/rockchip/Kconfig.soc b/soc/v2/rockchip/Kconfig.soc new file mode 100644 index 00000000000..2e782486499 --- /dev/null +++ b/soc/v2/rockchip/Kconfig.soc @@ -0,0 +1,13 @@ +# +# Copyright 2021 Huawei France Technologies SASU +# +# SPDX-License-Identifier: Apache-2.0 +# + +config SOC_FAMILY_ROCKCHIP + bool + +config SOC_FAMILY + default "rockchip" if SOC_FAMILY_ROCKCHIP + +rsource "*/Kconfig.soc" diff --git a/soc/v2/rockchip/rk3568/CMakeLists.txt b/soc/v2/rockchip/rk3568/CMakeLists.txt new file mode 100644 index 00000000000..22fc2aa11be --- /dev/null +++ b/soc/v2/rockchip/rk3568/CMakeLists.txt @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + +zephyr_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c) + +set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm64/scripts/linker.ld CACHE INTERNAL "") diff --git a/soc/arm64/rockchip/rk3568/Kconfig.soc b/soc/v2/rockchip/rk3568/Kconfig similarity index 59% rename from soc/arm64/rockchip/rk3568/Kconfig.soc rename to soc/v2/rockchip/rk3568/Kconfig index 7bb2be41909..92bda2c5b95 100644 --- a/soc/arm64/rockchip/rk3568/Kconfig.soc +++ b/soc/v2/rockchip/rk3568/Kconfig @@ -2,15 +2,8 @@ # Copyright 2022 openEuler SIG-Zephyr # SPDX-License-Identifier: Apache-2.0 -choice -prompt "Rockchip RK3568 SoC" -depends on SOC_SERIES_RK3568 - -config SOC_RK3568 - bool "Rockchip rk3568" +config SOC_SERIES_RK3568 select ARM64 select CPU_CORTEX_A55 select ARM_ARCH_TIMER select GIC_V3 - -endchoice diff --git a/soc/arm64/rockchip/rk3568/Kconfig.defconfig.series b/soc/v2/rockchip/rk3568/Kconfig.defconfig similarity index 61% rename from soc/arm64/rockchip/rk3568/Kconfig.defconfig.series rename to soc/v2/rockchip/rk3568/Kconfig.defconfig index 96279038e4a..b7f52249abe 100644 --- a/soc/arm64/rockchip/rk3568/Kconfig.defconfig.series +++ b/soc/v2/rockchip/rk3568/Kconfig.defconfig @@ -4,9 +4,6 @@ if SOC_SERIES_RK3568 -config SOC_SERIES - default "rk3568" - -source "soc/arm64/rockchip/rk3568/Kconfig.defconfig.rk3568" +rsource "Kconfig.defconfig.rk3568" endif # SOC_SERIES_RK3568 diff --git a/soc/arm64/rockchip/rk3568/Kconfig.defconfig.rk3568 b/soc/v2/rockchip/rk3568/Kconfig.defconfig.rk3568 similarity index 90% rename from soc/arm64/rockchip/rk3568/Kconfig.defconfig.rk3568 rename to soc/v2/rockchip/rk3568/Kconfig.defconfig.rk3568 index 13dca55c6e9..58cf932996f 100644 --- a/soc/arm64/rockchip/rk3568/Kconfig.defconfig.rk3568 +++ b/soc/v2/rockchip/rk3568/Kconfig.defconfig.rk3568 @@ -4,9 +4,6 @@ if SOC_RK3568 -config SOC - default "rk3568" - config FLASH_SIZE default 0 diff --git a/soc/v2/rockchip/rk3568/Kconfig.soc b/soc/v2/rockchip/rk3568/Kconfig.soc new file mode 100644 index 00000000000..4f0ce04b149 --- /dev/null +++ b/soc/v2/rockchip/rk3568/Kconfig.soc @@ -0,0 +1,20 @@ +# Copyright 2022 HNU-ESNL +# Copyright 2022 openEuler SIG-Zephyr +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_RK3568 + bool + select SOC_FAMILY_ROCKCHIP + +config SOC_RK3568 + bool + select SOC_SERIES_RK3568 + +config SOC + default "rk3568" if SOC_RK3568 + +config SOC_SERIES + default "rk3568" if SOC_RK3568 + +config SOC_PART_NUMBER + default "RK3568" if SOC_SERIES_RK3568 diff --git a/soc/arm64/rockchip/rk3568/mmu_regions.c b/soc/v2/rockchip/rk3568/mmu_regions.c similarity index 100% rename from soc/arm64/rockchip/rk3568/mmu_regions.c rename to soc/v2/rockchip/rk3568/mmu_regions.c diff --git a/soc/v2/rockchip/soc.yml b/soc/v2/rockchip/soc.yml new file mode 100644 index 00000000000..1b17323e11b --- /dev/null +++ b/soc/v2/rockchip/soc.yml @@ -0,0 +1,4 @@ +series: +- name: rk3568 + socs: + - name: rk3568