summaryrefslogtreecommitdiffstats
path: root/meta-raspberrypi-extras/recipes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-22 15:02:09 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-09-22 15:56:17 +0300
commit650460f8f125d18ae03c0622e3dd93630efb0fc7 (patch)
treecccae5089a35efb860e9bbe0ae9c20be114bf35a /meta-raspberrypi-extras/recipes
parentf668dddf1f95318b14737c6eb17dabbca213ca22 (diff)
parent2b9e77c40609da75fa44e3376341f484e0ab0288 (diff)
downloadmeta-boot2qt-650460f8f125d18ae03c0622e3dd93630efb0fc7.tar.gz
Merge remote-tracking branch 'origin/jethro' into merge
* origin/jethro: Rename last references to b2qt-utils Rename b2qt-utils to qtdeviceutilities toradex: apply u-boot and flashing script changes to colibri-imx7 nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support qt5: update submodules toradex: use latest u-boot and flashing scripts kontron: update to SMARC-sAMX6i BSP release v2.0, RC2 Use code.qt.io with git protocol instead of codereview Use new repo url for utils and appcontroller kontron: patch kernel to support newer vivante drivers Fetch only external repos for repo mirror qt5: update submodules Add rsync to image Fix raspberry3 build error in perl deployment rcar-gen2: USB fixups ostree: Added dependency for systemd qtquickcompiler: update revision qtquickcompiler: update revision Fix typo in RPi overlay config Update meta layers Conflicts: conf/distro/include/toradex.inc meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend recipes/ostree/ostree.bb recipes/samba/samba_4.1.12.bbappend scripts/manifest_jethro.xml Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848
Diffstat (limited to 'meta-raspberrypi-extras/recipes')
-rw-r--r--meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
index 544e48f..d2eb2b7 100644
--- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
+++ b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
@@ -28,8 +28,8 @@
28############################################################################ 28############################################################################
29 29
30do_deploy_append() { 30do_deploy_append() {
31 if [ "${RPI_FT5604}" = "1" ]; then 31 if [ "${RPI_FT5406}" = "1" ]; then
32 echo "# Enable rpi-ft5604 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt 32 echo "# Enable rpi-ft5406 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
33 echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt 33 echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
34 fi 34 fi
35} 35}