[PATCH 4/5] tune/arch-powerpc: Merge powerpc64 changes into powerpc

[Kumar Gala <galak@kernel.crashing.org>]

We should be able to get away with just one include to handle all
arch-powerpc needs.  Also update comments about the various choices
between 32-bit/64-bit and hard/soft floating point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/conf/machine/include/powerpc/arch-powerpc.inc |   14 ++++++++++----
 .../machine/include/powerpc/arch-powerpc64.inc     |    8 --------
 2 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 meta/conf/machine/include/powerpc/arch-powerpc64.inc

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 013755d..93b1c05 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -1,7 +1,6 @@
 # Power Architecture definition
-# Four defined ABIs, all combinations of:
-# *) Hard/Soft Floating Point
-# *) 32-bit/64-bit
+# *) Hard/Soft Floating Point on 32-bit
+# *) Hard Floating Point on 64-bit
 
 DEFAULTTUNE ?= "powerpc"
 
@@ -9,6 +8,11 @@ TUNEVALID[m32] = "Power ELF32 standard ABI"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
 
+TUNEVALID[m64] = "Power ELF64 standard ABI"
+TUNE_CONFLICTS[m64] = "m32 nf"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
+TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
+
 TUNEVALID[fpu-hard] = "Use hardware FPU."
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}"
 
@@ -29,4 +33,6 @@ BASE_LIB_tune-powerpc = "lib"
 TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft"
 BASE_LIB_tune-powerpc-nf = "lib"
 
-
+AVAILTUNES += "powerpc64"
+TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
+BASE_LIB_tune-powerpc64 = "lib64"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
deleted file mode 100644
index a965d59..0000000
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32 nf"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
-
-AVAILTUNES += "powerpc64"
-TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
-BASE_LIB_tune-powerpc64 = "lib64"
-- 
1.7.3.4