conf/machine: EXTRA_PACKAGES_ARCHS cleanup

All duplicates in EXTRA_PACKAGE_ARCHS are removed.

Moved EXTRA_PACKAGES_ARCHS to include/tune-* files (PPC and x86
targets), dropped it for ARM targets (as tune-arm* files have them
defined properly).

12 files changed, 12 insertions, 3 deletions

diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index 4e5be154dd..0df6917699 100644
--- a/conf/machine/include/tune-pentium.inc
+++ b/conf/machine/include/tune-pentium.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-march=pentium"
 BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS += "i386 i486"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486"
diff --git a/conf/machine/include/tune-pentium4c.inc b/conf/machine/include/tune-pentium4c.inc
index 302eb3c4a0..42de0d9abd 100644
--- a/conf/machine/include/tune-pentium4c.inc
+++ b/conf/machine/include/tune-pentium4c.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=prescott"
 BASE_PACKAGE_ARCH = "i686p4c"
-
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 63dda25f58..9b9a8be42f 100644
--- a/conf/machine/include/tune-pentiumpro.inc
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-march=pentiumpro"
 BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"
-PACKAGE_EXTRA_ARCHS += "i386 i486 i586"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc
index a54aec0336..e5edd68040 100644
--- a/conf/machine/include/tune-ppc405.inc
+++ b/conf/machine/include/tune-ppc405.inc
@@ -3,3 +3,4 @@ TARGET_FPU   ?=  "soft"
 TARGET_CC_ARCH = "-mcpu=405"
 BASE_PACKAGE_ARCH = "ppc405"
 FEED_ARCH = "ppc405"
+PACKAGE_EXTRA_ARCHS += "ppc405"
diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
index 7d7ca0ea11..feca186315 100644
--- a/conf/machine/include/tune-ppc440.inc
+++ b/conf/machine/include/tune-ppc440.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=440"
 BASE_PACKAGE_ARCH = "ppc440"
 FEED_ARCH = "ppc440"
+PACKAGE_EXTRA_ARCHS += "ppc440e"
diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc
index cbcef8a573..8b6955a817 100644
--- a/conf/machine/include/tune-ppc440e.inc
+++ b/conf/machine/include/tune-ppc440e.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
 BASE_PACKAGE_ARCH = "ppc440e"
 FEED_ARCH = "ppc440e"
+PACKAGE_EXTRA_ARCHS += "ppc440e"
diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc
index f48dc26e05..2f627a725d 100644
--- a/conf/machine/include/tune-ppc603e.inc
+++ b/conf/machine/include/tune-ppc603e.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
 BASE_PACKAGE_ARCH = "ppc603e"
 FEED_ARCH = "ppc603e"
+PACKAGE_EXTRA_ARCHS += "ppc603e"
diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc
index 41ddd4151a..1524c7cf86 100644
--- a/conf/machine/include/tune-ppce300c2.inc
+++ b/conf/machine/include/tune-ppce300c2.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=e300c2"
 BASE_PACKAGE_ARCH = "ppce300c2"
 FEED_ARCH = "ppce300c2"
+PACKAGE_EXTRA_ARCHS += "ppce300c2"
diff --git a/conf/machine/include/tune-ppce300c3.inc b/conf/machine/include/tune-ppce300c3.inc
index 24af11a8ba..467c4cc87f 100644
--- a/conf/machine/include/tune-ppce300c3.inc
+++ b/conf/machine/include/tune-ppce300c3.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=e300c3"
 BASE_PACKAGE_ARCH = "ppce300c3"
 FEED_ARCH = "ppce300c3"
+PACKAGE_EXTRA_ARCHS += "ppce300c3"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index 37499a61dc..5745c36311 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -6,3 +6,4 @@ ARM_ABI = "oabi"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
 FEED_ARCH = "arm-oabi"
 
+PACKAGE_EXTRA_ARCHS += "armv4 "
diff --git a/conf/machine/include/tune-x86-nocona.inc b/conf/machine/include/tune-x86-nocona.inc
index f1189a171e..9bee740dd4 100644
--- a/conf/machine/include/tune-x86-nocona.inc
+++ b/conf/machine/include/tune-x86-nocona.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=nocona"
 TARGET_CC_KERNEL_ARCH = "-march=nocona"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/include/tune-x86-prescott.inc b/conf/machine/include/tune-x86-prescott.inc
index f3ec4e956a..0a584f085a 100644
--- a/conf/machine/include/tune-x86-prescott.inc
+++ b/conf/machine/include/tune-x86-prescott.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=prescott"
 TARGET_CC_KERNEL_ARCH = "-march=prescott"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"