[oe-commits] org.oe.dev angstrom: add support for htcwallaby and htctornado

[koen commit]

angstrom: add support for htcwallaby and htctornado

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: fca5fc258af5822fa9cbd396aa5ba741851fee9c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fca5fc258af5822fa9cbd396aa5ba741851fee9c
Files:
1
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
Diffs:

#
# mt diff -r42d82be31cb76df637b9ce3fd3bf497d4e390d6a -rfca5fc258af5822fa9cbd396aa5ba741851fee9c
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [59159a926215caee1cf37b3d07c5a4bcf28deb10]
#    to [c179f84a5e47fd7d76d3e4e39f3f45ada3a4783b]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [cb939b1a389e8b33c0bf4f658e709da4337a4add]
#    to [c70c421338b418901a172a9210ea87a82ab763c0]
# 
# patch "conf/distro/include/angstrom-uclibc.inc"
#  from [5976f51d1a203540984b37aea9a01200c509f145]
#    to [acd77cb1b7ff38f08af7ea0f756e371ee8730a48]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	59159a926215caee1cf37b3d07c5a4bcf28deb10
+++ conf/distro/angstrom-2007.1.conf	c179f84a5e47fd7d76d3e4e39f3f45ada3a4783b
@@ -13,7 +13,7 @@ require conf/distro/include/sane-srcdate
 require conf/distro/include/sane-srcdates.inc
 
 #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc
 
 #Images built can have to modes:
@@ -54,6 +54,7 @@ FEED_ARCH_h5000		= "armv5te"
 FEED_ARCH_h3900		= "armv5te"
 FEED_ARCH_h4000		= "armv5te"
 FEED_ARCH_h5000		= "armv5te"
+FEED_ARCH_htctornado    = "armv5te"
 FEED_ARCH_htcuniversal 	= "armv5te"
 FEED_ARCH_hx2000	= "armv5te"
 FEED_ARCH_hx4700	= "armv5te"
@@ -88,6 +89,7 @@ FEED_ARCH_simpad        = "arm-oabi"
 FEED_ARCH_h3600         = "arm-oabi"
 FEED_ARCH_h3800         = "arm-oabi"
 FEED_ARCH_simpad        = "arm-oabi"
+FEED_ARCH_htcwallaby    = "arm-oabi"
 
 #Tweak packaging for strongarm machines since they can't use EABI
 
============================================================
--- conf/distro/include/angstrom-glibc.inc	cb939b1a389e8b33c0bf4f658e709da4337a4add
+++ conf/distro/include/angstrom-glibc.inc	c70c421338b418901a172a9210ea87a82ab763c0
@@ -1,9 +1,9 @@ PREFERRED_PROVIDER_virtual/libc ?= "glib
 # glibc:
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
============================================================
--- conf/distro/include/angstrom-uclibc.inc	5976f51d1a203540984b37aea9a01200c509f145
+++ conf/distro/include/angstrom-uclibc.inc	acd77cb1b7ff38f08af7ea0f756e371ee8730a48
@@ -7,7 +7,7 @@ USE_NLS_glib-2.0 = "yes"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
 
 #mess with compiler flags to use -Os instead of -O2