From fdb23693a4bff5e9e9472738a0278ae0b13411e0 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 29 Jul 2022 09:38:58 +0930 Subject: [PATCH] arch/powerpc: Enable powerpc64le only on CPUs that support it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Invalid configurations lead to build failures, such as trying to enable ppc64le for the ppc970: http://autobuild.buildroot.net/results/fda886768fce25ccd9b52b635ff5b13da7ba2d0c/ In order to run a ppc64le userspace a kernel that runs in this mode is required. The only CPU supported in buildroot that can boot a ppc64le kernel is Power8, so mark all of the other 64-bit capable CPUs as not supporting ppc64le. For Power7, the situation is not so clear, but there are anyway no commercially available CPUs for that architecture so it doesn't matter much either way. Let's be safe and disable LE on that one as well. This drops the comment about libc, which is true but doesn't tell the whole story. Note that we use positive logic for the new conditions, while the rest of the file uses negative logic. We'll fix that for the rest of the file in a follow-up patch. Signed-off-by: Joel Stanley Reviewed-by: Cédric Le Goater [Arnout: don't remove 32-bit support for POWER5+] Signed-off-by: Arnout Vandecappelle --- arch/Config.in.powerpc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index 9fa0be0d73..949995d037 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -67,11 +67,9 @@ config BR2_powerpc_604e depends on !BR2_ARCH_IS_64 config BR2_powerpc_620 bool "620" - # No C library supports this variant on ppc64le depends on !BR2_powerpc64le config BR2_powerpc_630 bool "630" - # No C library supports this variant on ppc64le depends on !BR2_powerpc64le config BR2_powerpc_740 bool "740" @@ -98,6 +96,7 @@ config BR2_powerpc_860 depends on !BR2_ARCH_IS_64 config BR2_powerpc_970 bool "970" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_8540 bool "8540 / e500v1" @@ -125,17 +124,17 @@ config BR2_powerpc_e6500 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power4 bool "power4" - # No C library supports this variant on ppc64le depends on !BR2_powerpc64le config BR2_powerpc_power5 bool "power5" - # No C library supports this variant on ppc64le depends on !BR2_powerpc64le config BR2_powerpc_power6 bool "power6" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power7 bool "power7" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_VSX config BR2_powerpc_power8 bool "power8"