x86: move soc/cpu to top-level under 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 <anas.nashif@intel.com>
This commit is contained in:
parent
3d1252ff2d
commit
cff0005a87
64 changed files with 11 additions and 12 deletions
|
@ -1,5 +1,5 @@
|
|||
zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
|
||||
zephyr_include_directories(${ZEPHYR_BASE}/arch/x86/soc/intel_quark)
|
||||
zephyr_include_directories(${ZEPHYR_BASE}/soc/x86/intel_quark)
|
||||
|
||||
zephyr_cc_option(-mcpu=quarkse_em -mno-sdata)
|
||||
|
||||
|
|
|
@ -68,7 +68,6 @@ add_custom_command(
|
|||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
add_subdirectory(soc/${SOC_PATH})
|
||||
# Must be last so that soc/ can override default exception handlers
|
||||
add_subdirectory(core)
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ choice
|
|||
prompt "x86 SoC Selection"
|
||||
depends on X86
|
||||
|
||||
source "arch/x86/soc/*/Kconfig.soc"
|
||||
source "soc/x86/*/Kconfig.soc"
|
||||
endchoice
|
||||
|
||||
menu "X86 Architecture Options"
|
||||
|
@ -18,7 +18,7 @@ menu "X86 Architecture Options"
|
|||
|
||||
# Include these first so that any properties (e.g. defaults) below can be
|
||||
# overriden (by defining symbols in multiple locations)
|
||||
source "arch/x86/soc/*/Kconfig"
|
||||
source "soc/x86/*/Kconfig"
|
||||
|
||||
config ARCH
|
||||
default "x86"
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
source "arch/x86/soc/intel_quark/*/Kconfig.defconfig.series"
|
|
@ -13,6 +13,6 @@ config SOC_FAMILY
|
|||
default "intel_quark"
|
||||
endif
|
||||
|
||||
source "arch/x86/soc/intel_quark/*/Kconfig.soc"
|
||||
source "soc/x86/intel_quark/*/Kconfig.soc"
|
||||
|
||||
source "arch/x86/soc/intel_quark/*/Kconfig"
|
||||
source "soc/x86/intel_quark/*/Kconfig"
|
1
soc/x86/intel_quark/Kconfig.defconfig
Normal file
1
soc/x86/intel_quark/Kconfig.defconfig
Normal file
|
@ -0,0 +1 @@
|
|||
source "soc/x86/intel_quark/*/Kconfig.defconfig.series"
|
|
@ -4,4 +4,4 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
source "arch/x86/soc/intel_quark/*/Kconfig.series"
|
||||
source "soc/x86/intel_quark/*/Kconfig.series"
|
|
@ -154,6 +154,6 @@ config SOC_FLASH_QMSI_SYS_SIZE
|
|||
endif # SOC_FLASH_QMSI
|
||||
|
||||
|
||||
source "arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000"
|
||||
source "soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000"
|
||||
|
||||
endif # SOC_SERIES_QUARK_D2000
|
|
@ -201,7 +201,7 @@ config USB_DW_IRQ_PRI
|
|||
default 3
|
||||
endif # USB
|
||||
|
||||
source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*"
|
||||
source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie*"
|
||||
source "soc/x86/intel_quark/quark_se/Kconfig.defconfig.quark_se*"
|
||||
source "soc/x86/intel_quark/quark_se/Kconfig.defconfig.curie*"
|
||||
|
||||
endif # SOC_SERIES_QUARK_SE
|
|
@ -243,5 +243,5 @@ config BT_UART_ON_DEV_NAME
|
|||
|
||||
endif
|
||||
|
||||
source "arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000"
|
||||
source "soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000"
|
||||
endif # SOC_SERIES_QUARK_X1000
|
Loading…
Add table
Add a link
Reference in a new issue