arm: soc: move arm SoCs to top-dir

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:
Anas Nashif 2018-09-03 15:47:02 -05:00
commit 70d819b405
426 changed files with 62 additions and 63 deletions

View file

@ -17,5 +17,4 @@ zephyr_compile_options(
${ARCH_FLAG} ${ARCH_FLAG}
) )
add_subdirectory(soc)
add_subdirectory(core) add_subdirectory(core)

View file

@ -11,7 +11,7 @@ choice
default SOC_SERIES_KINETIS_K6X default SOC_SERIES_KINETIS_K6X
depends on ARM depends on ARM
source "arch/arm/soc/*/Kconfig.soc" source "soc/arm/*/Kconfig.soc"
endchoice endchoice
menu "ARM Options" menu "ARM Options"
@ -20,7 +20,7 @@ menu "ARM Options"
menu "SoC Configuration" menu "SoC Configuration"
# Include these first so that any properties (e.g. defaults) below can be # Include these first so that any properties (e.g. defaults) below can be
# overriden (by defining symbols in multiple locations) # overriden (by defining symbols in multiple locations)
source "arch/arm/soc/*/Kconfig" source "soc/arm/*/Kconfig"
endmenu endmenu
source "arch/arm/core/Kconfig" source "arch/arm/core/Kconfig"

View file

@ -1 +0,0 @@
source "arch/arm/soc/nxp_kinetis/*/Kconfig.defconfig.series"

View file

@ -1 +0,0 @@
source "arch/arm/soc/silabs_exx32/*/Kconfig.defconfig.series"

View file

@ -1 +0,0 @@
source "arch/arm/soc/st_stm32/*/Kconfig.defconfig.series"

View file

@ -1 +0,0 @@
source "arch/arm/soc/ti_simplelink/*/Kconfig.defconfig.series"

View file

@ -1,4 +0,0 @@
# Kconfig - Texas Instruments SimpleLink Family
#
source "arch/arm/soc/ti_simplelink/*/Kconfig.series"

View file

@ -135,7 +135,7 @@ CCFG ("Customer Configuration" area). A 32-bit word in this area,
pass control to your program. You can find more information on the CCFG pass control to your program. You can find more information on the CCFG
in the `CC2650 reference manual`_, section 9.1. The current CC2650 port in the `CC2650 reference manual`_, section 9.1. The current CC2650 port
for Zephyr already does this by default; if you wish to check or modify for Zephyr already does this by default; if you wish to check or modify
the CCFG content, see :file:`arch/arm/soc/ti_simplelink/cc2650/soc.c`. the CCFG content, see :file:`soc/arm/ti_simplelink/cc2650/soc.c`.
Building Building
======== ========

View file

@ -14,5 +14,5 @@ config SOC_FAMILY
string string
default "arm" default "arm"
source "arch/arm/soc/arm/*/Kconfig.soc" source "soc/arm/arm/*/Kconfig.soc"
endif # SOC_FAMILY_ARM endif # SOC_FAMILY_ARM

View file

@ -5,4 +5,4 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
source "arch/arm/soc/arm/*/Kconfig.defconfig.series" source "soc/arm/arm/*/Kconfig.defconfig.series"

View file

@ -5,4 +5,4 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
source "arch/arm/soc/arm/*/Kconfig.series" source "soc/arm/arm/*/Kconfig.series"

View file

@ -8,7 +8,7 @@
if SOC_SERIES_BEETLE if SOC_SERIES_BEETLE
source "arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle*" source "soc/arm/arm/beetle/Kconfig.defconfig.beetle*"
config SOC_SERIES config SOC_SERIES
default "beetle" default "beetle"

View file

@ -13,6 +13,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
int int
default 25000000 default 25000000
source "arch/arm/soc/arm/mps2/Kconfig.defconfig.mps2*" source "soc/arm/arm/mps2/Kconfig.defconfig.mps2*"
endif # SOC_SERIES_MPS2 endif # SOC_SERIES_MPS2

View file

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2017 Linaro Limited * Copyright (c) 2017 Linaro Limited
* *
* Initial contents based on arch/arm/soc/ti_lm3s6965/soc.c which is: * Initial contents based on soc/arm/ti_lm3s6965/soc.c which is:
* Copyright (c) 2013-2015 Wind River Systems, Inc. * Copyright (c) 2013-2015 Wind River Systems, Inc.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0

View file

@ -14,6 +14,6 @@ config SOC_FAMILY
default "atmel_sam" default "atmel_sam"
# Select SoC Part No. and configuration options # Select SoC Part No. and configuration options
source "arch/arm/soc/atmel_sam/*/Kconfig.soc" source "soc/arm/atmel_sam/*/Kconfig.soc"
endif # SOC_FAMILY_SAM endif # SOC_FAMILY_SAM

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
source "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series" source "soc/arm/atmel_sam/*/Kconfig.defconfig.series"
if SOC_FAMILY_SAM if SOC_FAMILY_SAM

View file

@ -4,4 +4,4 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
source "arch/arm/soc/atmel_sam/*/Kconfig.series" source "soc/arm/atmel_sam/*/Kconfig.series"

View file

@ -12,6 +12,6 @@ config SOC_FAMILY
string string
default "atmel_sam0" default "atmel_sam0"
source arch/arm/soc/atmel_sam0/common/Kconfig.samd2x source soc/arm/atmel_sam0/common/Kconfig.samd2x
source "arch/arm/soc/atmel_sam0/*/Kconfig.soc" source "soc/arm/atmel_sam0/*/Kconfig.soc"
endif endif

View file

@ -3,4 +3,4 @@
# Copyright (c) 2017 Google LLC. # Copyright (c) 2017 Google LLC.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
source "arch/arm/soc/atmel_sam0/*/Kconfig.defconfig.series" source "soc/arm/atmel_sam0/*/Kconfig.defconfig.series"

View file

@ -3,4 +3,4 @@
# Copyright (c) 2017 Google LLC. # Copyright (c) 2017 Google LLC.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
source "arch/arm/soc/atmel_sam0/*/Kconfig.series" source "soc/arm/atmel_sam0/*/Kconfig.series"

Some files were not shown because too many files have changed in this diff Show more