diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-06-09 07:59:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-17 08:28:55 +0200 |
| commit | ae40ce8d196625644c421f1cd4c6af9151f9f412 (patch) | |
| tree | e1c2330083058e3fbdb8c2b65c0814da6ba823f8 | |
| parent | 36838b7efcd0b622266e96fb826396d5ceb2458b (diff) | |
| download | barebox-ae40ce8d196625644c421f1cd4c6af9151f9f412.tar.gz barebox-ae40ce8d196625644c421f1cd4c6af9151f9f412.tar.xz | |
ARM: cpu: prevent recursive dependencies via CPU_SUPPORTS_64BIT_KERNEL
For ARM, CONFIG_CPU_SUPPORTS_64BIT_KERNEL's only function, along with
CONFIG_SYS_SUPPORTS_64BIT_KERNEL is to control visibility of the 64BIT
symbol. Select it from CPU_V8 is detrimental, because subarches may
want to select CPU_SUPPORTS_64BIT_KERNEL unconditionally and select
CPU_V8 only if 64BIT was chosen. This currently leads to a recursive
dependency, so break this up. No functional change just yet.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20220609055922.667016-11-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-layerscape/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 299e0ab080..57cef3f28d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -272,6 +272,7 @@ config ARCH_ZYNQMP select OFDEVICE select OFTREE select RELOCATABLE + select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select HAS_MACB @@ -282,6 +283,7 @@ config ARCH_ARM64_VIRT select OFDEVICE select OFTREE select RELOCATABLE + select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select ARM_AMBA select BOARD_ARM_VIRT diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig index 0a493754a4..5639d1eeff 100644 --- a/arch/arm/cpu/Kconfig +++ b/arch/arm/cpu/Kconfig @@ -87,7 +87,6 @@ config CPU_V7 config CPU_V8 bool select CPU_64v8 - select CPU_SUPPORTS_64BIT_KERNEL select ARM_EXCEPTIONS select GENERIC_FIND_NEXT_BIT select ARCH_HAS_STACK_DUMP diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6b962dcf7e..9b9f5a472e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -177,6 +177,7 @@ config ARCH_IMX8M select CPU_V8 select PINCTRL_IMX_IOMUX_V3 select OFTREE + select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select COMMON_CLK_OF_PROVIDER select ARCH_HAS_FEC_IMX diff --git a/arch/arm/mach-layerscape/Kconfig b/arch/arm/mach-layerscape/Kconfig index bdd7d0dbfe..9ad58eba55 100644 --- a/arch/arm/mach-layerscape/Kconfig +++ b/arch/arm/mach-layerscape/Kconfig @@ -17,6 +17,7 @@ config ARCH_LAYERSCAPE_PPA config ARCH_LS1046 select CPU_V8 + select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL bool diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index ffd3aa8a4e..1206384207 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -30,6 +30,7 @@ config ARCH_RK3288 config ARCH_ROCKCHIP_V8 bool select CPU_V8 + select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select ARM_ATF select RELOCATABLE |