From 563c161a80e1e6db90d13182d58e180fa387ba89 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 3 Sep 2018 16:56:32 -0500 Subject: [PATCH] posix: move soc to top-level dir soc/ Move the SoC outside of the architecture tree and put them at the same level as boards and architectures allowing both SoCs and boards to be maintained outside the tree. Signed-off-by: Anas Nashif --- arch/posix/CMakeLists.txt | 1 - arch/posix/Kconfig | 4 ++-- {arch/posix/soc => soc/posix}/CMakeLists.txt | 0 {arch/posix/soc => soc/posix}/inf_clock/CMakeLists.txt | 0 {arch/posix/soc => soc/posix}/inf_clock/Kconfig.defconfig | 0 {arch/posix/soc => soc/posix}/inf_clock/Kconfig.soc | 0 {arch/posix/soc => soc/posix}/inf_clock/linker.ld | 0 {arch/posix/soc => soc/posix}/inf_clock/posix_board_if.h | 0 {arch/posix/soc => soc/posix}/inf_clock/posix_soc.h | 0 {arch/posix/soc => soc/posix}/inf_clock/soc.c | 0 {arch/posix/soc => soc/posix}/inf_clock/soc.h | 0 {arch/posix/soc => soc/posix}/inf_clock/soc_irq.h | 0 12 files changed, 2 insertions(+), 3 deletions(-) rename {arch/posix/soc => soc/posix}/CMakeLists.txt (100%) rename {arch/posix/soc => soc/posix}/inf_clock/CMakeLists.txt (100%) rename {arch/posix/soc => soc/posix}/inf_clock/Kconfig.defconfig (100%) rename {arch/posix/soc => soc/posix}/inf_clock/Kconfig.soc (100%) rename {arch/posix/soc => soc/posix}/inf_clock/linker.ld (100%) rename {arch/posix/soc => soc/posix}/inf_clock/posix_board_if.h (100%) rename {arch/posix/soc => soc/posix}/inf_clock/posix_soc.h (100%) rename {arch/posix/soc => soc/posix}/inf_clock/soc.c (100%) rename {arch/posix/soc => soc/posix}/inf_clock/soc.h (100%) rename {arch/posix/soc => soc/posix}/inf_clock/soc_irq.h (100%) diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt index ec4421b60b5..a7f4b0402a7 100644 --- a/arch/posix/CMakeLists.txt +++ b/arch/posix/CMakeLists.txt @@ -40,5 +40,4 @@ zephyr_ld_options( # be included in a few zephyr kernel files. -add_subdirectory(soc) add_subdirectory(core) diff --git a/arch/posix/Kconfig b/arch/posix/Kconfig index 5f75213059d..c0789084423 100644 --- a/arch/posix/Kconfig +++ b/arch/posix/Kconfig @@ -10,7 +10,7 @@ choice prompt "POSIX Configuration Selection" depends on ARCH_POSIX - source "arch/posix/soc/*/Kconfig.soc" + source "soc/posix/*/Kconfig.soc" endchoice menu "POSIX (native) Options" @@ -20,7 +20,7 @@ menu "POSIX (native) Options" # overriden (by defining symbols in multiple locations) # # (No SoC-specific Kconfig files as of writing, hence the optional source.) -osource "arch/posix/soc/*/Kconfig" +osource "soc/posix/*/Kconfig" config ARCH default "posix" diff --git a/arch/posix/soc/CMakeLists.txt b/soc/posix/CMakeLists.txt similarity index 100% rename from arch/posix/soc/CMakeLists.txt rename to soc/posix/CMakeLists.txt diff --git a/arch/posix/soc/inf_clock/CMakeLists.txt b/soc/posix/inf_clock/CMakeLists.txt similarity index 100% rename from arch/posix/soc/inf_clock/CMakeLists.txt rename to soc/posix/inf_clock/CMakeLists.txt diff --git a/arch/posix/soc/inf_clock/Kconfig.defconfig b/soc/posix/inf_clock/Kconfig.defconfig similarity index 100% rename from arch/posix/soc/inf_clock/Kconfig.defconfig rename to soc/posix/inf_clock/Kconfig.defconfig diff --git a/arch/posix/soc/inf_clock/Kconfig.soc b/soc/posix/inf_clock/Kconfig.soc similarity index 100% rename from arch/posix/soc/inf_clock/Kconfig.soc rename to soc/posix/inf_clock/Kconfig.soc diff --git a/arch/posix/soc/inf_clock/linker.ld b/soc/posix/inf_clock/linker.ld similarity index 100% rename from arch/posix/soc/inf_clock/linker.ld rename to soc/posix/inf_clock/linker.ld diff --git a/arch/posix/soc/inf_clock/posix_board_if.h b/soc/posix/inf_clock/posix_board_if.h similarity index 100% rename from arch/posix/soc/inf_clock/posix_board_if.h rename to soc/posix/inf_clock/posix_board_if.h diff --git a/arch/posix/soc/inf_clock/posix_soc.h b/soc/posix/inf_clock/posix_soc.h similarity index 100% rename from arch/posix/soc/inf_clock/posix_soc.h rename to soc/posix/inf_clock/posix_soc.h diff --git a/arch/posix/soc/inf_clock/soc.c b/soc/posix/inf_clock/soc.c similarity index 100% rename from arch/posix/soc/inf_clock/soc.c rename to soc/posix/inf_clock/soc.c diff --git a/arch/posix/soc/inf_clock/soc.h b/soc/posix/inf_clock/soc.h similarity index 100% rename from arch/posix/soc/inf_clock/soc.h rename to soc/posix/inf_clock/soc.h diff --git a/arch/posix/soc/inf_clock/soc_irq.h b/soc/posix/inf_clock/soc_irq.h similarity index 100% rename from arch/posix/soc/inf_clock/soc_irq.h rename to soc/posix/inf_clock/soc_irq.h