diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 765767eca2..d4e204a463 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -16,118 +16,118 @@ choice
 config BR2_generic_powerpc
 	bool "generic"
 	# No C library supports this variant on ppc64le
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 config BR2_powerpc_401
 	bool "401"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_403
 	bool "403"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_405
 	bool "405"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_405fp
 	bool "405 with FPU"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_440
 	bool "440"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_440fp
 	bool "440 with FPU"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_464
 	bool "464"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_464fp
 	bool "464 with FPU"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_476
 	bool "476"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_476fp
 	bool "476 with FPU"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_505
 	bool "505"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_602
 	bool "602"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_603
 	bool "603"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_603e
 	bool "603e"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_604
 	bool "604"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_604e
 	bool "604e"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_620
 	bool "620"
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 config BR2_powerpc_630
 	bool "630"
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 config BR2_powerpc_740
 	bool "740"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_7400
 	bool "7400"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_7450
 	bool "7450"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_750
 	bool "750"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_821
 	bool "821"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_823
 	bool "823"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_860
 	bool "860"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 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"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 	select BR2_POWERPC_CPU_HAS_SPE
 config BR2_powerpc_8548
 	bool "8548 / e500v2"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 	select BR2_POWERPC_CPU_HAS_SPE
 config BR2_powerpc_e300c2
 	bool "e300c2"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_e300c3
 	bool "e300c3"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_e500mc
 	bool "e500mc"
-	depends on !BR2_ARCH_IS_64
+	depends on BR2_powerpc
 config BR2_powerpc_e5500
 	bool "e5500"
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 config BR2_powerpc_e6500
 	bool "e6500"
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_power4
 	bool "power4"
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 config BR2_powerpc_power5
 	bool "power5"
-	depends on !BR2_powerpc64le
+	depends on BR2_powerpc || BR2_powerpc64
 config BR2_powerpc_power6
 	bool "power6"
 	depends on BR2_powerpc || BR2_powerpc64