From: Sergey Lapin Date: Mon, 22 Mar 2010 15:13:56 +0000 (+0300) Subject: Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into... X-Git-Tag: Release-2010-05/1~339^2~20 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3937c88166a493900a694ea8fe53b860f4099d83;p=openembedded.git Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev --- 3937c88166a493900a694ea8fe53b860f4099d83 diff --cc contrib/angstrom/sort.sh index dcbb22408c,2d0598b41c..5522d44800 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@@ -46,9 -46,9 +46,9 @@@ case "$arch" i "armv4") machines="h3600 h3800 collie simpad htcwallaby" ;; "armv4t") - machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; + machines="micro2440 mini2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;; + machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone hipox" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp")