From 8064c8997e2e72e6d8dc431e71aadbbe8ed9f5fe Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 12 Dec 2016 15:11:50 +0200 Subject: rpi: remove rpi-ft5406 overlay The rpi-ft5406 touch display support is also build as a kernel module, so there is no need to build separate overlay file. Change-Id: I6c0d99d5aedad2d24e8e23723613b0a52dcb7736 Reviewed-by: Teemu Holappa --- conf/distro/include/raspberrypi.inc | 1 - .../recipes/bootfiles/rpi-config_git.bbappend | 35 ---------------------- 2 files changed, 36 deletions(-) delete mode 100644 meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc index aa7839a..9d8b526 100644 --- a/conf/distro/include/raspberrypi.inc +++ b/conf/distro/include/raspberrypi.inc @@ -40,5 +40,4 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1" # video camera support VIDEO_CAMERA = "1" -RPI_FT5604 = "1" MACHINE_FEATURES += "pitft" diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend deleted file mode 100644 index d2eb2b7..0000000 --- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_deploy_append() { - if [ "${RPI_FT5406}" = "1" ]; then - echo "# Enable rpi-ft5406 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt - echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt - fi -} -- cgit v1.2.3-54-g00ecf