diff --git a/soc/rockchip/rk35/CMakeLists.txt b/soc/rockchip/rk35/CMakeLists.txt new file mode 100644 index 00000000000..23c2d5fea6e --- /dev/null +++ b/soc/rockchip/rk35/CMakeLists.txt @@ -0,0 +1,6 @@ +# Copyright 2024 Université Gustave Eiffel +# SPDX-License-Identifier: Apache-2.0 + +if(CONFIG_SOC_RK3568) + add_subdirectory(rk3568) +endif() diff --git a/soc/rockchip/rk35/Kconfig b/soc/rockchip/rk35/Kconfig new file mode 100644 index 00000000000..80f0d67eb4d --- /dev/null +++ b/soc/rockchip/rk35/Kconfig @@ -0,0 +1,11 @@ +# +# Copyright 2021 Huawei France Technologies SASU +# +# SPDX-License-Identifier: Apache-2.0 +# + +if SOC_FAMILY_ROCKCHIP + +rsource "*/Kconfig" + +endif # SOC_FAMILY_ROCKCHIP diff --git a/soc/rockchip/rk35/Kconfig.defconfig b/soc/rockchip/rk35/Kconfig.defconfig new file mode 100644 index 00000000000..122e92dc999 --- /dev/null +++ b/soc/rockchip/rk35/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/rockchip/rk35/Kconfig.soc b/soc/rockchip/rk35/Kconfig.soc new file mode 100644 index 00000000000..5c3276841f8 --- /dev/null +++ b/soc/rockchip/rk35/Kconfig.soc @@ -0,0 +1,11 @@ +# Copyright 2024 Université Gustave Eiffel +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_RK35 + bool + select SOC_FAMILY_ROCKCHIP + +config SOC_SERIES + default "rk35" if SOC_SERIES_RK35 + +rsource "*/Kconfig.soc" diff --git a/soc/rockchip/rk3568/CMakeLists.txt b/soc/rockchip/rk35/rk3568/CMakeLists.txt similarity index 100% rename from soc/rockchip/rk3568/CMakeLists.txt rename to soc/rockchip/rk35/rk3568/CMakeLists.txt diff --git a/soc/rockchip/rk3568/Kconfig b/soc/rockchip/rk35/rk3568/Kconfig similarity index 74% rename from soc/rockchip/rk3568/Kconfig rename to soc/rockchip/rk35/rk3568/Kconfig index b5b046b0430..e29f96c8c77 100644 --- a/soc/rockchip/rk3568/Kconfig +++ b/soc/rockchip/rk35/rk3568/Kconfig @@ -2,10 +2,10 @@ # Copyright 2022 openEuler SIG-Zephyr # SPDX-License-Identifier: Apache-2.0 -config SOC_SERIES_RK3568 +config SOC_RK3568 select ARM64 select CPU_CORTEX_A55 select ARM_ARCH_TIMER config SOC_PART_NUMBER - default "RK3568" if SOC_SERIES_RK3568 + default "RK3568" if SOC_RK3568 diff --git a/soc/rockchip/rk3568/Kconfig.defconfig b/soc/rockchip/rk35/rk3568/Kconfig.defconfig similarity index 88% rename from soc/rockchip/rk3568/Kconfig.defconfig rename to soc/rockchip/rk35/rk3568/Kconfig.defconfig index b7f52249abe..28b62874a3d 100644 --- a/soc/rockchip/rk3568/Kconfig.defconfig +++ b/soc/rockchip/rk35/rk3568/Kconfig.defconfig @@ -2,7 +2,7 @@ # Copyright 2022 openEuler SIG-Zephyr # SPDX-License-Identifier: Apache-2.0 -if SOC_SERIES_RK3568 +if SOC_RK3568 rsource "Kconfig.defconfig.rk3568" diff --git a/soc/rockchip/rk3568/Kconfig.defconfig.rk3568 b/soc/rockchip/rk35/rk3568/Kconfig.defconfig.rk3568 similarity index 100% rename from soc/rockchip/rk3568/Kconfig.defconfig.rk3568 rename to soc/rockchip/rk35/rk3568/Kconfig.defconfig.rk3568 diff --git a/soc/rockchip/rk3568/Kconfig.soc b/soc/rockchip/rk35/rk3568/Kconfig.soc similarity index 55% rename from soc/rockchip/rk3568/Kconfig.soc rename to soc/rockchip/rk35/rk3568/Kconfig.soc index 7d965d764cb..1acf4d0ffe4 100644 --- a/soc/rockchip/rk3568/Kconfig.soc +++ b/soc/rockchip/rk35/rk3568/Kconfig.soc @@ -2,16 +2,9 @@ # 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 + select SOC_SERIES_RK35 config SOC default "rk3568" if SOC_RK3568 - -config SOC_SERIES - default "rk3568" if SOC_RK3568 diff --git a/soc/rockchip/rk3568/mmu_regions.c b/soc/rockchip/rk35/rk3568/mmu_regions.c similarity index 100% rename from soc/rockchip/rk3568/mmu_regions.c rename to soc/rockchip/rk35/rk3568/mmu_regions.c diff --git a/soc/rockchip/soc.yml b/soc/rockchip/soc.yml index 5568a11aa49..1c13067004a 100644 --- a/soc/rockchip/soc.yml +++ b/soc/rockchip/soc.yml @@ -4,6 +4,6 @@ family: - name: rk3399 socs: - name: rk3399 - - name: rk3568 + - name: rk35 socs: - name: rk3568