diff options
| -rw-r--r-- | conf/distro/include/colibri-vf.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/toradex.inc | 2 | ||||
| -rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch (renamed from meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch) | 0 | ||||
| -rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch (renamed from meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch) | 0 | ||||
| -rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend (renamed from meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend) | 0 | ||||
| -rw-r--r-- | scripts/manifest.xml | 12 | ||||
| -rw-r--r-- | scripts/manifest_fido.xml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index d92410c8..d413d9f7 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -23,7 +23,7 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ - u-boot-nand-${MACHINE}.imx:u-boot-nand.imx \ + u-boot-nand.imx:u-boot-nand.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ flash_blk-${MACHINE}.img:flash_blk.img \ " diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 167f3d48..063244e5 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -1,2 +1,2 @@ BBMASK ?= " " -BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer" +BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch index 43edec3d..43edec3d 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch +++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch index d92ac620..d92ac620 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch +++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend index fd9ad55f..fd9ad55f 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1be3fc03..7e0c0f9a 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -12,21 +12,21 @@ <project name="poky" remote="yocto" - revision="08d32590411568e7bf11612ac695a6e9c6df6286" + revision="57eb677f0efe9a4060c764e8e9dfe2440d4e5eb2" path="sources/poky"/> <project name="meta-openembedded" remote="oe" - revision="10d3c8f85280a0bf867a8e4f84bcda81c290d28e" + revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c" path="sources/meta-openembedded"/> <project name="meta-fsl-arm" remote="yocto" - revision="44a5115b6ece869cfb10714423e6956128dbaef8" + revision="f30b056c8f1af3f3122f94dbaa4698da5d620a41" path="sources/meta-fsl-arm" groups="notdefault,fsl,toradex,architech"/> <project name="meta-ti" remote="yocto" - revision="477f7b7f03dd7c803803101240a416e88cf49fcc" + revision="0a222c70845d19a2213ac36803361e8531768cca" path="sources/meta-ti" groups="notdefault,ti,bbb"/> <project name="meta-raspberrypi" @@ -36,7 +36,7 @@ groups="notdefault,rpi"/> <project name="meta-fsl-arm-extra" remote="freescale" - revision="436b86e3421736216412bdbb21cd9cb08c758c75" + revision="c0ff75e85bcbd616362c21e501dc6df187612cf9" path="sources/meta-fsl-arm-extra" groups="notdefault,fsl,toradex,architech"/> <project name="meta-beagleboard" @@ -46,7 +46,7 @@ groups="notdefault,bbb"/> <project name="meta-toradex" remote="toradex" - revision="a76e317a2ae638ed62ccf88636aa79d0ae368d78" + revision="eb0c16acb10257c60ddbfce8ad71448b2e987fb4" path="sources/meta-toradex" groups="notdefault,toradex"/> <project name="meta-tibidabo" diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index ac622429..1c89e64b 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml @@ -46,7 +46,7 @@ groups="notdefault,bbb"/> <project name="meta-toradex" remote="toradex" - revision="V2.4" + revision="V2.5" path="sources/meta-toradex" groups="notdefault,toradex"/> <project name="meta-tibidabo" |