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@xxxxxxxxxxxxxx> --- arch/arm/Kconfig | 2 ++ arch/arm/cpu/Kconfig | 1 - arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-layerscape/Kconfig | 1 + arch/arm/mach-rockchip/Kconfig | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8a1d75c19b65..215abd19b553 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -276,6 +276,7 @@ config ARCH_ZYNQMP select OFDEVICE select OFTREE select RELOCATABLE + select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select HAS_MACB @@ -286,6 +287,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 0a493754a418..5639d1eeffc3 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 6b962dcf7e34..9b9f5a472ef9 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 bdd7d0dbfe52..9ad58eba5575 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 4b6dfd2c17a9..e09c4837d59d 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 -- 2.30.2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
