angstrom: add FEED_ARCH to overrides and replace most machine based overrides with the arch based overrides

* makes life easier for people with out-of-tree machines

3 files changed, 16 insertions, 14 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index a78469c3d1..bbfa3a521c 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -89,10 +89,10 @@ PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
 #powerpc needs additional patches to gcc
-PREFERRED_VERSION_gcc_dht-walnut               ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_dht-walnut         ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_dht-walnut     ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc_ppc405               	?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_ppc405         	?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_ppc405     	?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_ppc405 	?= "4.1.1"
 
 PREFERRED_VERSION_gcc_xilinx-ml403               ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross_xilinx-ml403         ?= "4.1.1"
@@ -104,11 +104,11 @@ PREFERRED_VERSION_gcc-cross_mpc8323e-rdb         ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb     ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
 
-# GCC 4.3.0 is the first release with armv7 support
-#PREFERRED_VERSION_gcc_beagleboard               = "4.3.0"
-#PREFERRED_VERSION_gcc-cross_beagleboard         = "4.3.0"
-#PREFERRED_VERSION_gcc-cross-sdk_beagleboard     = "4.3.0"
-#PREFERRED_VERSION_gcc-cross-initial_beagleboard = "4.3.0"
+# GCC 4.3.0 is the first release with armv7-* support
+PREFERRED_VERSION_gcc_armv7a               	= "4.3.0"
+PREFERRED_VERSION_gcc-cross_armv7a         	= "4.3.0"
+PREFERRED_VERSION_gcc-cross-sdk_armv7a     	= "4.3.0"
+PREFERRED_VERSION_gcc-cross-initial_armv7a 	= "4.3.0"
 
 PREFERRED_VERSION_gcc               ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.2.2"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index f02e045dbf..fbc7305ce9 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -18,6 +18,7 @@ FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O2" 
 
 BUILD_OPTIMIZATION = "-Os"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index bb1d65dec3..f53f1fb8bd 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -9,6 +9,10 @@ DISTRO_NAME = "Angstrom"
 
 TARGET_VENDOR = "-angstrom"
 
+# Add FEED_ARCH to overrides
+OVERRIDES .= ":${FEED_ARCH}"
+
+
 # Can be "glibc", "eglibc" or "uclibc"
 ANGSTROM_MODE ?= "glibc"
 PSTAGE_EXTRAPATH = "${ANGSTROM_MODE}"
@@ -61,11 +65,8 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 LOCALE_UTF8_ONLY = "1"
 
 #qemu doesn't like armv6/eabi/vfp
-ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
-ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"
-ENABLE_BINARY_LOCALE_GENERATION_omap2420h4 = "0"
-ENABLE_BINARY_LOCALE_GENERATION_omap2430sdp = "0"
-ENABLE_BINARY_LOCALE_GENERATION_beagleboard = "0"
+ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0"
+ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
 
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"