diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2013-10-16 12:31:20 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2013-10-16 12:31:20 +0200 |
commit | d4b41fd08e51d88e96d3a9c1672f4fcb41aeccb5 (patch) | |
tree | 24a581b48f8b76a7dfa81f7cb518e8b5b4b5d9ae | |
parent | aaed099138dbf13e9dffcc89f47df08130fb08dd (diff) |
machines: T30 and VF50 consitstently use NEON and hard float
- Colibri T30 and Apalis T30 changed to NEON
- Colibri VF50 changed to hard float
This makes packages built for T30 incompatible with Colibri T20
(but Colibri T20 packages can still be used on T30)
-rw-r--r-- | conf/machine/apalis-t30.conf | 5 | ||||
-rw-r--r-- | conf/machine/colibri-t30.conf | 5 | ||||
-rw-r--r-- | conf/machine/colibri-vf50.conf | 2 | ||||
-rw-r--r-- | recipes/trdx-config/angstrom-feed-configs.bbappend | 18 |
4 files changed, 17 insertions, 13 deletions
diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf index 0ea77d4..adf30fc 100644 --- a/conf/machine/apalis-t30.conf +++ b/conf/machine/apalis-t30.conf @@ -36,8 +36,5 @@ EXTRA_IMAGEDEPENDS += "u-boot" SERIAL_CONSOLE = "115200 ttyS0" IMAGE_FSTYPES ?= "tar.bz2" -# T20 does not have neon, so at the moment we also do not compile for neon on T30 -DEFAULTTUNE = "armv7ahf" -#choose a specific vfp, or we end up with the default vfpv2 optimization -TUNE_CCARGS += "-mfpu=vfpv3-d16" +DEFAULTTUNE = "armv7ahf-neon" require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf index ff8f83d..3118b0d 100644 --- a/conf/machine/colibri-t30.conf +++ b/conf/machine/colibri-t30.conf @@ -36,8 +36,5 @@ EXTRA_IMAGEDEPENDS += "u-boot" SERIAL_CONSOLE = "115200 ttyS0" IMAGE_FSTYPES ?= "tar.bz2" -# T20 does not have neon, so at the moment we also do not compile for neon on T30 -DEFAULTTUNE = "armv7ahf" -#choose a specific vfp, or we end up with the default vfpv2 optimization -TUNE_CCARGS += "-mfpu=vfpv3-d16" +DEFAULTTUNE = "armv7ahf-neon" require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/colibri-vf50.conf b/conf/machine/colibri-vf50.conf index c482ca5..422e18a 100644 --- a/conf/machine/colibri-vf50.conf +++ b/conf/machine/colibri-vf50.conf @@ -3,6 +3,8 @@ #@SOC: vf50 #@DESCRIPTION: Toradex Colibri VF50 +#use hard float +DEFAULTTUNE = "armv7ahf-neon" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa5.inc diff --git a/recipes/trdx-config/angstrom-feed-configs.bbappend b/recipes/trdx-config/angstrom-feed-configs.bbappend index 2874c30..b7a3894 100644 --- a/recipes/trdx-config/angstrom-feed-configs.bbappend +++ b/recipes/trdx-config/angstrom-feed-configs.bbappend @@ -30,9 +30,17 @@ do_compile_append_tegra2() { do_compile_append_colibri-vf50() { #trdx: make available the feeds of a compatible arm architecture rm ${S}/${sysconfdir}/opkg/*vf*-feed.conf - echo "src/gz base ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/armv6-vfp/base" > ${S}/${sysconfdir}/opkg/base-feed.conf - echo "src/gz debug ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/armv6-vfp/debug" > ${S}/${sysconfdir}/opkg/debug-feed.conf - echo "src/gz gstreamer ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/armv6-vfp/gstreamer" > ${S}/${sysconfdir}/opkg/gstreamer-feed.conf - echo "src/gz perl ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/armv6-vfp/perl" > ${S}/${sysconfdir}/opkg/perl-feed.conf - echo "src/gz python ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/armv6-vfp/python" > ${S}/${sysconfdir}/opkg/python-feed.conf + echo "src/gz base ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/cortexa8hf-vfp-neon/base" > ${S}/${sysconfdir}/opkg/base-feed.conf + echo "src/gz debug ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/cortexa8hf-vfp-neon/debug" > ${S}/${sysconfdir}/opkg/debug-feed.conf + echo "src/gz gstreamer ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/cortexa8hf-vfp-neon/gstreamer" > ${S}/${sysconfdir}/opkg/gstreamer-feed.conf + echo "src/gz perl ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/cortexa8hf-vfp-neon/perl" > ${S}/${sysconfdir}/opkg/perl-feed.conf + echo "src/gz python ${ANGSTROM_URI}/feeds/v2013.06/ipk/eglibc/cortexa8hf-vfp-neon/python" > ${S}/${sysconfdir}/opkg/python-feed.conf +} + +pkg_postinst_${PN}_vf50 () { +#!/bin/sh +if [ "x$D" != "x" ]; then + exit 1 +fi + echo "arch cortexa8hf-vfp-neon 18" >> ${sysconfdir}/opkg/arch.conf } |