diff options
| author |   Klaus Kurzmann <mok@fluxnetz.de> | 2009-10-22 11:29:40 +0200 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-10-22 11:29:40 +0200 |
| commit | e745d5de2489a09d44c682e9ad34895b27626da6 (patch) | |
| tree | 7fda31666b425d756a2605d6521bb7a4fbc91e85 /contrib | |
| parent | 2cb2b439b125c0af5fa5725be435d2a534332bdd (diff) | |
| parent | 30776429ddedfc3ffd9d5b718bb755ee226ce739 (diff) | |
| download | openembedded-e745d5de2489a09d44c682e9ad34895b27626da6.tar.gz | |
Merge branch 'org.openembedded.dev' into shr/merge
Conflicts:
conf/checksums.ini
recipes/libgee/libgee-native_git.bb
recipes/xorg-lib/pixman_0.16.2.bb
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/angstrom/sort.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index b1f9314a66..c8b1d764aa 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -48,7 +48,7 @@ case "$arch" in "armv4t") machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug 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="da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client 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" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") @@ -58,7 +58,7 @@ case "$arch" in "armv7") machines="" ;; "armv7a") - machines="omap3-touchbook beagleboard omap3evm omap3517-evm omap3-pandora omapzoom omapzoom2 overo" ;; + machines="igep0020 omap3-touchbook beagleboard omap3evm omap3517-evm omap3-pandora omapzoom omapzoom2 overo" ;; "avr32") machines="atngw100 at32stk1000" ;; "bfin") |