arch/ppc: commonalise the 32- and 64-bit PowerPC arch

3 files changed, 18 insertions, 34 deletions

diff --git a/config/arch/powerpc-powerpc64.in-common b/config/arch/powerpc-powerpc64.in-common
deleted file mode 100644
index 95f2859..0000000
--- a/config/arch/powerpc-powerpc64.in-common
+++ /dev/null
@@ -1,21 +0,0 @@
-# powerpc and powerpc64 common options
-
-if ARCH_powerpc || ARCH_powerpc64
-
-config ARCH_POWERPC_SPE
-    bool
-    prompt "Enable SPE support"
-    default n
-    help
-      Add support for the Signal Processing Engine.  This will set up
-      the toolchain so that it supports the SPE ABI extensions. This
-      mainly targets Freescale e500 processors.
-
-      Setting this option will append "spe" to the end of your target
-      tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
-      configure/build system will know to include SPE ABI support.
-      It will also automatically add "-mabi=spe -mspe" to your
-      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
-      so you do not need to explicitly add them.
-
-endif # ARCH_powerpc || ARCH_powerpc64
diff --git a/config/arch/powerpc.in b/config/arch/powerpc.in
index 53a8c3b..90b1816 100644
--- a/config/arch/powerpc.in
+++ b/config/arch/powerpc.in
@@ -1,6 +1,9 @@
 # powerpc specific configuration file
 
 config ARCH_powerpc
+    select ARCH_SUPPORTS_32
+    select ARCH_SUPPORTS_64 if EXPERIMENTAL
+    select ARCH_DEFAULT_32
     select ARCH_USE_MMU
     select ARCH_SUPPORT_ABI
     select ARCH_SUPPORT_CPU
@@ -9,3 +12,18 @@ config ARCH_powerpc
       The PowerPC architecture, as defined by:
         http://www.ibm.com/developerworks/eserver/articles/archguide.html
 
+config ARCH_POWERPC_SPE
+    bool
+    prompt "Enable SPE support"
+    default n
+    help
+      Add support for the Signal Processing Engine.  This will set up
+      the toolchain so that it supports the SPE ABI extensions. This
+      mainly targets Freescale e500 processors.
+      
+      Setting this option will append "spe" to the end of your target
+      tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
+      configure/build system will know to include SPE ABI support.
+      It will also automatically add "-mabi=spe -mspe" to your
+      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
+      so you do not need to explicitly add them.
diff --git a/config/arch/powerpc64.in b/config/arch/powerpc64.in
deleted file mode 100644
index c6d35e1..0000000
--- a/config/arch/powerpc64.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# powerpc specific configuration file
-# depends on EXPERIMENTAL
-
-config ARCH_powerpc64
-    select ARCH_USE_MMU
-    select ARCH_64
-    select ARCH_SUPPORT_ABI
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    help
-      The PowerPC architecture, as defined by:
-        http://www.ibm.com/developerworks/eserver/articles/archguide.html
-