arch: arm: Clean up configurations

This is a minor clean-up for the ARM architecture configurations.

Note that the `CPU_CORTEX_A` symbol is moved from the AArch64 to the
ARM root Kconfig because it can be selected from both AArch32 and
AArch64.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
This commit is contained in:
Stephanos Ioannidis 2020-03-31 10:56:32 +09:00 committed by Ioannis Glaropoulos
commit 3cf1a9139e
3 changed files with 14 additions and 22 deletions

View file

@ -6,9 +6,6 @@
menu "ARM Options"
depends on ARM
rsource "core/aarch32/Kconfig"
rsource "core/aarch64/Kconfig"
config ARCH
default "arm"
@ -16,6 +13,11 @@ config ARM64
bool
select 64BIT
config CPU_CORTEX
bool
help
This option signifies the use of a CPU of the Cortex family.
config ARM_CUSTOM_INTERRUPT_CONTROLLER
bool
depends on !CPU_CORTEX_M
@ -36,4 +38,12 @@ config ARM_CUSTOM_INTERRUPT_CONTROLLER
family cores. The Cortex-M family cores are always equipped with
the ARM Nested Vectored Interrupt Controller (NVIC).
if !ARM64
rsource "core/aarch32/Kconfig"
endif
if ARM64
rsource "core/aarch64/Kconfig"
endif
endmenu

View file

@ -3,13 +3,6 @@
# Copyright (c) 2015 Wind River Systems, Inc.
# SPDX-License-Identifier: Apache-2.0
if !ARM64
config CPU_CORTEX
bool
help
This option signifies the use of a CPU of the Cortex family.
config CPU_CORTEX_M
bool
select CPU_CORTEX
@ -239,5 +232,3 @@ endchoice
rsource "cortex_m/Kconfig"
rsource "cortex_a_r/Kconfig"
endif # !ARM64

View file

@ -3,13 +3,6 @@
# Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
# SPDX-License-Identifier: Apache-2.0
if ARM64
config CPU_CORTEX
bool
help
This option signifies the use of a CPU of the Cortex family.
config CPU_CORTEX_A
bool
select CPU_CORTEX
@ -164,8 +157,6 @@ config ARM64_PA_BITS
default 42 if ARM64_PA_BITS_42
default 48 if ARM64_PA_BITS_48
endif #ARM_MMU
endif # ARM_MMU
endif # CPU_CORTEX_A
endif # ARM64