diff --git a/soc/x86/atom/CMakeLists.txt b/soc/v2/intel/atom/CMakeLists.txt similarity index 79% rename from soc/x86/atom/CMakeLists.txt rename to soc/v2/intel/atom/CMakeLists.txt index 66d55c6ba96..e0cae8af244 100644 --- a/soc/x86/atom/CMakeLists.txt +++ b/soc/v2/intel/atom/CMakeLists.txt @@ -1,3 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 +zephyr_include_directories(.) + set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "") diff --git a/soc/x86/atom/Kconfig.soc b/soc/v2/intel/atom/Kconfig similarity index 87% rename from soc/x86/atom/Kconfig.soc rename to soc/v2/intel/atom/Kconfig index ac396eec880..e72c924c63f 100644 --- a/soc/x86/atom/Kconfig.soc +++ b/soc/v2/intel/atom/Kconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_ATOM - bool "Intel ATOM SoC" select X86 select CPU_ATOM select X86_MMU diff --git a/soc/x86/atom/Kconfig.defconfig b/soc/v2/intel/atom/Kconfig.defconfig similarity index 88% rename from soc/x86/atom/Kconfig.defconfig rename to soc/v2/intel/atom/Kconfig.defconfig index 743b43465f4..35b7deb8e07 100644 --- a/soc/x86/atom/Kconfig.defconfig +++ b/soc/v2/intel/atom/Kconfig.defconfig @@ -5,9 +5,6 @@ if SOC_ATOM -config SOC - default "atom" - config SYS_CLOCK_HW_CYCLES_PER_SEC default 25000000 if HPET_TIMER diff --git a/soc/v2/intel/atom/Kconfig.soc b/soc/v2/intel/atom/Kconfig.soc new file mode 100644 index 00000000000..63c130640eb --- /dev/null +++ b/soc/v2/intel/atom/Kconfig.soc @@ -0,0 +1,9 @@ +# Copyright (c) 2024 Intel Corporation. +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_ATOM + bool + +config SOC + default "atom" if SOC_ATOM diff --git a/soc/x86/atom/linker.ld b/soc/v2/intel/atom/linker.ld similarity index 100% rename from soc/x86/atom/linker.ld rename to soc/v2/intel/atom/linker.ld diff --git a/soc/x86/atom/soc.h b/soc/v2/intel/atom/soc.h similarity index 100% rename from soc/x86/atom/soc.h rename to soc/v2/intel/atom/soc.h diff --git a/soc/v2/intel/atom/soc.yml b/soc/v2/intel/atom/soc.yml new file mode 100644 index 00000000000..456cfe068d7 --- /dev/null +++ b/soc/v2/intel/atom/soc.yml @@ -0,0 +1,4 @@ +vendor: intel +comment: "Intel Atom SoC" +socs: +- name: atom