pitft: Add support for pitft35r
PATCH 1/5 pitft: Add support for pitft35r
From: Rob Woolley <[email protected]>
The support for the PiTFT 3.5 inch resistive touchscreen is optional. It may be enabled by adding the following line in local.conf:
MACHINE_FEATURES += "pitft pitft35r"
--- README | 1 + conf/machine/include/rpi-base.inc | 1 + conf/machine/raspberrypi3-64.conf | 1 + recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++ 4 files changed, 9 insertions(+)
README +1 -0
@@ -241,6 +241,7 @@ the modelname should be added as a MACHINE_FEATURES in local.conf like below: List of currently supported models: - pitft22 - pitft28r + - pitft35r 3.O. Misc. display ==================
conf/machine/include/rpi-base.inc +1 -0
@@ -31,6 +31,7 @@ KERNEL_DEVICETREE ?= " \ overlays/lirc-rpi.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ + overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/w1-gpio.dtbo \
conf/machine/raspberrypi3-64.conf +1 -0
@@ -23,6 +23,7 @@ KERNEL_DEVICETREE = " \ overlays/lirc-rpi.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ + overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/w1-gpio.dtbo \
recipes-bsp/bootfiles/rpi-config_git.bb +6 -0
@@ -18,6 +18,7 @@ PR = "r5" PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}" PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}" +PITFT35r="${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}" VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}"
@@ -99,6 +100,11 @@ do_deploy() { echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt fi + if [ "${PITFT35r}" = "1" ]; then + echo "# Enable PITFT35r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "dtoverlay=pitft35-resistive,rotate=90,speed=42000000,fps=20" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt + fi + # UART support if [ "${ENABLE_UART}" = "1" ]; then echo "# Enable UART" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
Signature · 1 line
2.12.2
PATCH 2/5 linux-raspberrypi_4.9.bb: Update to 4.9.21
--- recipes-kernel/linux/linux-raspberrypi_4.9.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-kernel/linux/linux-raspberrypi_4.9.bb +2 -2
@@ -1,8 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.9.13" +LINUX_VERSION ?= "4.9.21" -SRCREV = "28ea32b9afb5d813986c4ab940c26fe298d80ed2" +SRCREV = "5e4ee836560d4c0371e109bf469e1ad808ae7a44" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.9.y \ " require linux-raspberrypi.inc
Signature · 1 line
2.12.2
Re: [meta-raspberrypi][PATCH 2/5] linux-raspberrypi_4.9.bb: Update to 4.9.21
Quoted 23 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-kernel/linux/linux-raspberrypi_4.9.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)recipes-kernel/linux/linux-raspberrypi_4.9.bb +2
-3@@ -1,8 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.9.13" +LINUX_VERSION ?= "4.9.21" -SRCREV = "28ea32b9afb5d813986c4ab940c26fe298d80ed2" +SRCREV = "5e4ee836560d4c0371e109bf469e1ad808ae7a44" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.9.y \ " require linux-raspberrypi.inc --2.12.2
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Merged a similar patch to master.
--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan
PATCH 3/5 userland: Upgrade to latest
In reply to Khem Raj--- .../0002-wayland-Add-support-for-the-Wayland-winsys.patch | 12 ++++++------ recipes-graphics/userland/userland_git.bb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch +6 -6
@@ -1,4 +1,4 @@ -From 5f9e011a6c15b3a05b3be412d7ba5c1077ececf1 Mon Sep 17 00:00:00 2001 +From 61a9d792ed774af43e592aa8fdb2a18488696d0f Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso <[email protected]> Date: Tue, 1 Oct 2013 13:19:20 +0200 Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys
@@ -102,7 +102,7 @@ index 358d2b4..4da4448 100644 + +$ BUILD_WAYLAND=1 ./buildme. diff --git a/buildme b/buildme -index 1061745..d0e6e54 100755 +index b8fd440..a780bb6 100755 --- a/buildme +++ b/buildme @@ -8,6 +8,10 @@ fi
@@ -117,7 +117,7 @@ index 1061745..d0e6e54 100755 # Native compile on the Raspberry Pi mkdir -p build/raspberry/$BUILDSUBDIR @@ -32,9 +36,13 @@ elif [ "$1" = "--native" ]; then - make -j 6 $* + make -j `nproc` $* else # Cross compile on a more capable machine + if [ -n "$BUILD_WAYLAND" ]; then
@@ -128,7 +128,7 @@ index 1061745..d0e6e54 100755 pushd build/arm-linux/$BUILDSUBDIR - cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE ../../.. + cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE $WAYLAND_VARS ../../.. - make -j 6 + make -j `nproc` if [ "$1" != "" ]; then diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
@@ -1604,7 +1604,7 @@ index 37fdae1..fe3619a 100755 } #endif diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c -index 133e86d..45f4cff 100755 +index 7a6cdcd..eab146e 100755 --- a/interface/vmcs_host/vc_vchi_dispmanx.c +++ b/interface/vmcs_host/vc_vchi_dispmanx.c @@ -1319,3 +1319,45 @@ static void *dispmanx_notify_func( void *arg ) {
@@ -1885,5 +1885,5 @@ index 0000000..ad90d30 + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() -- -2.12.0 +2.12.2
recipes-graphics/userland/userland_git.bb +1 -1
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "cdb5da59f939eb4078e90ed0e3c231c498ba9957" +SRCREV = "f0642e3b58d8a140a3f7621630c15fbfa794b19d" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
Signature · 1 line
2.12.2
Andrei Gherzan
AppliedRe: [meta-raspberrypi][PATCH 3/5] userland: Upgrade to latest
Quoted 75 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- .../0002-wayland-Add-support-for-the-Wayland-winsys.patch | 12 ++++++------ recipes-graphics/userland/userland_git.bb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch +6
-6@@ -1,4 +1,4 @@ -From 5f9e011a6c15b3a05b3be412d7ba5c1077ececf1 Mon Sep 17 00:00:00 2001 +From 61a9d792ed774af43e592aa8fdb2a18488696d0f Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso <[email protected]> Date: Tue, 1 Oct 2013 13:19:20 +0200 Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys@@ -102,7 +102,7 @@ index 358d2b4..4da4448 100644 + +$ BUILD_WAYLAND=1 ./buildme. diff --git a/buildme b/buildme -index 1061745..d0e6e54 100755 +index b8fd440..a780bb6 100755 --- a/buildme +++ b/buildme @@ -8,6 +8,10 @@ fi@@ -117,7 +117,7 @@ index 1061745..d0e6e54 100755 # Native compile on the Raspberry Pi mkdir -p build/raspberry/$BUILDSUBDIR @@ -32,9 +36,13 @@ elif [ "$1" = "--native" ]; then - make -j 6 $* + make -j `nproc` $* else # Cross compile on a more capable machine + if [ -n "$BUILD_WAYLAND" ]; then@@ -128,7 +128,7 @@ index 1061745..d0e6e54 100755 pushd build/arm-linux/$BUILDSUBDIR - cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE ../../.. + cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE $WAYLAND_VARS ../../.. - make -j 6 + make -j `nproc` if [ "$1" != "" ]; then diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt@@ -1604,7 +1604,7 @@ index 37fdae1..fe3619a 100755 } #endif diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c -index 133e86d..45f4cff 100755 +index 7a6cdcd..eab146e 100755 --- a/interface/vmcs_host/vc_vchi_dispmanx.c +++ b/interface/vmcs_host/vc_vchi_dispmanx.c @@ -1319,3 +1319,45 @@ static void *dispmanx_notify_func( void *arg ) {@@ -1885,5 +1885,5 @@ index 0000000..ad90d30 + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() -- -2.12.0 +2.12.2recipes-graphics/userland/userland_git.bb +1
-2@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "cdb5da59f939eb4078e90ed0e3c231c498ba9957" +SRCREV = "f0642e3b58d8a140a3f7621630c15fbfa794b19d" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ --2.12.2
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Merged to master. Thanks Khem!
--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan
PATCH 4/5 eglinfo-fb: Mark is userland specific
In reply to Khem RajIt does not yet compile/work with vc4 open graphics driver
--- recipes-graphics/eglinfo/eglinfo-fb_%.bbappend | 1 + 1 file changed, 1 insertion(+)
recipes-graphics/eglinfo/eglinfo-fb_%.bbappend +1 -0
@@ -1 +1,2 @@ EGLINFO_DEVICE_rpi = "raspberrypi" +COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '"(.*)"', d)}"
Signature · 1 line
2.12.2
Andrei Gherzan
AppliedRe: [meta-raspberrypi][PATCH 4/5] eglinfo-fb: Mark is userland specific
Quoted 17 lines · Khem Raj
It does not yet compile/work with vc4 open graphics driver
Signed-off-by Khem Raj <[email protected]>--- recipes-graphics/eglinfo/eglinfo-fb_%.bbappend | 1 + 1 file changed, 1 insertion(+)recipes-graphics/eglinfo/eglinfo-fb_%.bbappend +1
-1@@ -1 +1,2 @@ EGLINFO_DEVICE_rpi = "raspberrypi" +COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '"(.*)"', d)}" --2.12.2
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Merged to master. Thanks!
--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan
PATCH 5/5 firmware: Update to 1.20170405 release
In reply to Khem Raj--- recipes-bsp/common/firmware.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-bsp/common/firmware.inc +3 -3
@@ -1,10 +1,10 @@ -RPIFW_DATE ?= "20170303" +RPIFW_DATE ?= "20170405" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/1.${RPIFW_DATE}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "c87bc1bffbb8f254fc739e34baa03b02" -SRC_URI[sha256sum] = "ee8758d7e63c8fea7c8b7b476ff1c09f9591c74349b7751036a78ae5b88eca36" +SRC_URI[md5sum] = "ea82d14a7cd8cfae9b78e00d4e56bc71" +SRC_URI[sha256sum] = "2f4e5bddbac1372590db203002c35cbba3fb9d6172a93c314ee27bf05ae13bff" PV = "${RPIFW_DATE}"
Signature · 1 line
2.12.2
Re: [meta-raspberrypi][PATCH 5/5] firmware: Update to 1.20170405 release
Quoted 26 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-bsp/common/firmware.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)recipes-bsp/common/firmware.inc +3
-4@@ -1,10 +1,10 @@ -RPIFW_DATE ?= "20170303" +RPIFW_DATE ?= "20170405" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/1.${RPIFW_DATE}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "c87bc1bffbb8f254fc739e34baa03b02" -SRC_URI[sha256sum] = "ee8758d7e63c8fea7c8b7b476ff1c09f9591c74349b7751036a78ae5b88eca36" +SRC_URI[md5sum] = "ea82d14a7cd8cfae9b78e00d4e56bc71" +SRC_URI[sha256sum] = "2f4e5bddbac1372590db203002c35cbba3fb9d6172a93c314ee27bf05ae13bff" PV = "${RPIFW_DATE}" --2.12.2
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Merged a similar patch.
--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan
Quoted 79 lines · Khem Raj
From: Rob Woolley <[email protected]>
The support for the PiTFT 3.5 inch resistive touchscreen is optional. It may be enabled by adding the following line in local.conf:
MACHINE_FEATURES+= "pitft pitft35r"Signed-off-by Rob Woolley <[email protected]>Signed-off-by Khem Raj <[email protected]>--- README | 1 + conf/machine/include/rpi-base.inc | 1 + conf/machine/raspberrypi3-64.conf | 1 + recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++ 4 files changed, 9 insertions(+)README +1
-0@@ -241,6 +241,7 @@ the modelname should be added as a MACHINE_FEATURES in local.conf like below: List of currently supported models: - pitft22 - pitft28r + - pitft35r 3.O. Misc. display ==================conf/machine/include/rpi-base.inc +1
-0@@ -31,6 +31,7 @@ KERNEL_DEVICETREE ?= " \ overlays/lirc-rpi.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ + overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/w1-gpio.dtbo \conf/machine/raspberrypi3-64.conf +1
-0@@ -23,6 +23,7 @@ KERNEL_DEVICETREE = " \ overlays/lirc-rpi.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ + overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/w1-gpio.dtbo \recipes-bsp/bootfiles/rpi-config_git.bb +6
-1@@ -18,6 +18,7 @@ PR = "r5" PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}" PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}" +PITFT35r="${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}" VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}"@@ -99,6 +100,11 @@ do_deploy() { echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt fi + if [ "${PITFT35r}" = "1" ]; then + echo "# Enable PITFT35r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "dtoverlay=pitft35-resistive,rotate=90,speed=42000000,fps=20" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt + fi + # UART support if [ "${ENABLE_UART}" = "1" ]; then echo "# Enable UART" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt --2.12.2
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Merged the patches from Rob. Thanks.
--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan