* [meta-raspberrypi][PATCH 0/4] Various upgrade/fixes from Technux
@ 2016-03-29 15:04 Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r Petter Mabäcker
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Petter Mabäcker @ 2016-03-29 15:04 UTC (permalink / raw)
To: yocto
Various fixes from Technux, with focus on PiTFT28 resistive support and
Official Raspberry Pi 7 inch touchscreen enablers.
Petter Mabäcker (4):
pitft: Add support for pitft28r
rpi-base.inc: Remove deprecated MACHINE_FEATURES
rpi-base.inc: Add overlay for rpi-ft5406
.gitignore: Ignore some additional files
.gitignore | 2 ++
README | 1 +
conf/machine/include/rpi-base.inc | 4 +++-
recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++
.../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf | 5 +++++
.../xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf | 6 ++++++
.../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf | 5 -----
recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 6 ++++--
recipes-kernel/linux/linux-raspberrypi.inc | 2 ++
9 files changed, 29 insertions(+), 8 deletions(-)
create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
--
1.9.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r
2016-03-29 15:04 [meta-raspberrypi][PATCH 0/4] Various upgrade/fixes from Technux Petter Mabäcker
@ 2016-03-29 15:04 ` Petter Mabäcker
2016-03-29 15:59 ` Khem Raj
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 2/4] rpi-base.inc: Remove deprecated MACHINE_FEATURES Petter Mabäcker
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Petter Mabäcker @ 2016-03-29 15:04 UTC (permalink / raw)
To: yocto
The support for PiTFT 28 inch resistive touchscreen is optional
and can be enabled by adding below in local.conf:
MACHINE_FEATURES += "pitft pitft28r"
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
README | 1 +
conf/machine/include/rpi-base.inc | 1 +
recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++
.../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf | 5 +++++
.../xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf | 6 ++++++
.../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf | 5 -----
recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 6 ++++--
recipes-kernel/linux/linux-raspberrypi.inc | 2 ++
8 files changed, 25 insertions(+), 7 deletions(-)
create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
diff --git a/README b/README
index 536926b..54b1ac3 100644
--- a/README
+++ b/README
@@ -232,6 +232,7 @@ the modelname should be added as a MACHINE_FEATURES in local.conf like below:
List of currently supported models:
- pitft22
+ - pitft28r
4. Extra apps
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index 792150e..a9e8053 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -33,6 +33,7 @@ KERNEL_DEVICETREE ?= " \
overlays/iqaudio-dacplus-overlay.dtb \
overlays/lirc-rpi-overlay.dtb \
overlays/pitft22-overlay.dtb \
+ overlays/pitft28-resistive-overlay.dtb \
overlays/pps-gpio-overlay.dtb \
overlays/w1-gpio-overlay.dtb \
overlays/w1-gpio-pullup-overlay.dtb \
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index 4d41723..2941982 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -17,6 +17,7 @@ PR = "r4"
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)}"
inherit deploy
@@ -90,6 +91,11 @@ do_deploy() {
echo "# Enable PITFT22 display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
fi
+
+ if [ "${PITFT28r}" = "1" ]; then
+ echo "# Enable PITFT28r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+ echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+ fi
}
addtask deploy before do_package after do_install
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
new file mode 100644
index 0000000..0d2b36b
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
@@ -0,0 +1,5 @@
+Section "Device"
+ Identifier "Adafruit PiTFT"
+ Driver "fbdev"
+ Option "fbdev" "/dev/fb1"
+EndSection
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
new file mode 100644
index 0000000..f8b578c
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+ Identifier "calibration"
+ MatchProduct "stmpe-ts"
+ Option "Calibration" "3800 200 200 3800"
+ Option "SwapAxes" "1"
+EndSection
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
deleted file mode 100644
index 0d2b36b..0000000
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
- Identifier "Adafruit PiTFT"
- Driver "fbdev"
- Option "fbdev" "/dev/fb1"
-EndSection
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 0ae2ee0..062de2d 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,7 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \
- file://xorg.conf.d/99-pitft.conf \
+ file://xorg.conf.d/98-pitft.conf \
+ file://xorg.conf.d/99-calibration.conf \
"
do_install_append_rpi () {
@@ -10,7 +11,8 @@ do_install_append_rpi () {
PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
if [ "${PITFT}" = "1" ]; then
- install -m 0644 ${WORKDIR}/xorg.conf.d/99-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+ install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+ install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
fi
}
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 24e7fe2..142ad7f 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -27,6 +27,8 @@ CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=ttyAMA0,11520
UDEV_GE_141 ?= "1"
+KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}"
+
# Set programmatically some variables during recipe parsing
# See http://www.yoctoproject.org/docs/current/bitbake-user-manual/bitbake-user-manual.html#anonymous-python-functions
python __anonymous () {
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-raspberrypi][PATCH 2/4] rpi-base.inc: Remove deprecated MACHINE_FEATURES
2016-03-29 15:04 [meta-raspberrypi][PATCH 0/4] Various upgrade/fixes from Technux Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r Petter Mabäcker
@ 2016-03-29 15:04 ` Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 3/4] rpi-base.inc: Add overlay for rpi-ft5406 Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 4/4] .gitignore: Ignore some additional files Petter Mabäcker
3 siblings, 0 replies; 8+ messages in thread
From: Petter Mabäcker @ 2016-03-29 15:04 UTC (permalink / raw)
To: yocto
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
conf/machine/include/rpi-base.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index a9e8053..f70e952 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -40,7 +40,7 @@ KERNEL_DEVICETREE ?= " \
"
KERNEL_IMAGETYPE ?= "Image"
-MACHINE_FEATURES += "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
+MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
# Raspberry Pi has no hardware clock
MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-raspberrypi][PATCH 3/4] rpi-base.inc: Add overlay for rpi-ft5406
2016-03-29 15:04 [meta-raspberrypi][PATCH 0/4] Various upgrade/fixes from Technux Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 2/4] rpi-base.inc: Remove deprecated MACHINE_FEATURES Petter Mabäcker
@ 2016-03-29 15:04 ` Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 4/4] .gitignore: Ignore some additional files Petter Mabäcker
3 siblings, 0 replies; 8+ messages in thread
From: Petter Mabäcker @ 2016-03-29 15:04 UTC (permalink / raw)
To: yocto
rpi-ft5406 is an enabler for Official Raspberry Pi 7 inch
touchscreen support.
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
conf/machine/include/rpi-base.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index f70e952..34eb774 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -35,6 +35,7 @@ KERNEL_DEVICETREE ?= " \
overlays/pitft22-overlay.dtb \
overlays/pitft28-resistive-overlay.dtb \
overlays/pps-gpio-overlay.dtb \
+ overlays/rpi-ft5406-overlay.dtb \
overlays/w1-gpio-overlay.dtb \
overlays/w1-gpio-pullup-overlay.dtb \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-raspberrypi][PATCH 4/4] .gitignore: Ignore some additional files
2016-03-29 15:04 [meta-raspberrypi][PATCH 0/4] Various upgrade/fixes from Technux Petter Mabäcker
` (2 preceding siblings ...)
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 3/4] rpi-base.inc: Add overlay for rpi-ft5406 Petter Mabäcker
@ 2016-03-29 15:04 ` Petter Mabäcker
3 siblings, 0 replies; 8+ messages in thread
From: Petter Mabäcker @ 2016-03-29 15:04 UTC (permalink / raw)
To: yocto
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index f235765..bd5616a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
build*
*~
.*.swp
+*.orig
+*.rej
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r Petter Mabäcker
@ 2016-03-29 15:59 ` Khem Raj
2016-03-29 20:54 ` Petter Mabäcker
0 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2016-03-29 15:59 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 6958 bytes --]
> On Mar 29, 2016, at 8:04 AM, Petter Mabäcker <petter@technux.se> wrote:
>
> The support for PiTFT 28 inch resistive touchscreen is optional
> and can be enabled by adding below in local.conf:
>
> MACHINE_FEATURES += "pitft pitft28r”
>
will this work with all kernel recipes available in layer ?
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
> README | 1 +
> conf/machine/include/rpi-base.inc | 1 +
> recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++
> .../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf | 5 +++++
> .../xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf | 6 ++++++
> .../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf | 5 -----
> recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 6 ++++--
> recipes-kernel/linux/linux-raspberrypi.inc | 2 ++
> 8 files changed, 25 insertions(+), 7 deletions(-)
> create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
> create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
> delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
>
> diff --git a/README b/README
> index 536926b..54b1ac3 100644
> --- a/README
> +++ b/README
> @@ -232,6 +232,7 @@ the modelname should be added as a MACHINE_FEATURES in local.conf like below:
>
> List of currently supported models:
> - pitft22
> + - pitft28r
>
>
> 4. Extra apps
> diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
> index 792150e..a9e8053 100644
> --- a/conf/machine/include/rpi-base.inc
> +++ b/conf/machine/include/rpi-base.inc
> @@ -33,6 +33,7 @@ KERNEL_DEVICETREE ?= " \
> overlays/iqaudio-dacplus-overlay.dtb \
> overlays/lirc-rpi-overlay.dtb \
> overlays/pitft22-overlay.dtb \
> + overlays/pitft28-resistive-overlay.dtb \
> overlays/pps-gpio-overlay.dtb \
> overlays/w1-gpio-overlay.dtb \
> overlays/w1-gpio-pullup-overlay.dtb \
> diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
> index 4d41723..2941982 100644
> --- a/recipes-bsp/bootfiles/rpi-config_git.bb
> +++ b/recipes-bsp/bootfiles/rpi-config_git.bb
> @@ -17,6 +17,7 @@ PR = "r4"
>
> 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)}"
>
> inherit deploy
>
> @@ -90,6 +91,11 @@ do_deploy() {
> echo "# Enable PITFT22 display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> fi
> +
> + if [ "${PITFT28r}" = "1" ]; then
> + echo "# Enable PITFT28r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> + echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> + fi
> }
>
> addtask deploy before do_package after do_install
> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
> new file mode 100644
> index 0000000..0d2b36b
> --- /dev/null
> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
> @@ -0,0 +1,5 @@
> +Section "Device"
> + Identifier "Adafruit PiTFT"
> + Driver "fbdev"
> + Option "fbdev" "/dev/fb1"
> +EndSection
> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
> new file mode 100644
> index 0000000..f8b578c
> --- /dev/null
> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
> @@ -0,0 +1,6 @@
> +Section "InputClass"
> + Identifier "calibration"
> + MatchProduct "stmpe-ts"
> + Option "Calibration" "3800 200 200 3800"
> + Option "SwapAxes" "1"
> +EndSection
> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> deleted file mode 100644
> index 0d2b36b..0000000
> --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -Section "Device"
> - Identifier "Adafruit PiTFT"
> - Driver "fbdev"
> - Option "fbdev" "/dev/fb1"
> -EndSection
> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> index 0ae2ee0..062de2d 100644
> --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> @@ -1,7 +1,8 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \
> - file://xorg.conf.d/99-pitft.conf \
> + file://xorg.conf.d/98-pitft.conf \
> + file://xorg.conf.d/99-calibration.conf \
> "
>
> do_install_append_rpi () {
> @@ -10,7 +11,8 @@ do_install_append_rpi () {
>
> PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
> if [ "${PITFT}" = "1" ]; then
> - install -m 0644 ${WORKDIR}/xorg.conf.d/99-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> + install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> + install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> fi
> }
>
> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
> index 24e7fe2..142ad7f 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -27,6 +27,8 @@ CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=ttyAMA0,11520
>
> UDEV_GE_141 ?= "1"
>
> +KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}"
> +
> # Set programmatically some variables during recipe parsing
> # See http://www.yoctoproject.org/docs/current/bitbake-user-manual/bitbake-user-manual.html#anonymous-python-functions
> python __anonymous () {
> --
> 1.9.1
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r
2016-03-29 15:59 ` Khem Raj
@ 2016-03-29 20:54 ` Petter Mabäcker
2016-03-29 22:20 ` Andrei Gherzan
0 siblings, 1 reply; 8+ messages in thread
From: Petter Mabäcker @ 2016-03-29 20:54 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
On 03/29/2016 05:59 PM, Khem Raj wrote:
>> On Mar 29, 2016, at 8:04 AM, Petter Mabäcker <petter@technux.se> wrote:
>>
>> The support for PiTFT 28 inch resistive touchscreen is optional
>> and can be enabled by adding below in local.conf:
>>
>> MACHINE_FEATURES += "pitft pitft28r”
>>
> will this work with all kernel recipes available in layer ?
It works on 3.18+. I just realized that 3.14 support was not removed
when we took in 4.4 (so it will not work on that kernel). Since the
general policy we have is to support three kernel versions; latest
stable (4.4) + two longterm (4.1 and 3.18), I can send up a commit that
removes 3.14 support in 'master' within this series.
Thanks for your help to pointing this out!
BR Petter
>
>
>> Signed-off-by: Petter Mabäcker <petter@technux.se>
>> ---
>> README | 1 +
>> conf/machine/include/rpi-base.inc | 1 +
>> recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++
>> .../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf | 5 +++++
>> .../xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf | 6 ++++++
>> .../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf | 5 -----
>> recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 6 ++++--
>> recipes-kernel/linux/linux-raspberrypi.inc | 2 ++
>> 8 files changed, 25 insertions(+), 7 deletions(-)
>> create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
>> create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
>> delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
>>
>> diff --git a/README b/README
>> index 536926b..54b1ac3 100644
>> --- a/README
>> +++ b/README
>> @@ -232,6 +232,7 @@ the modelname should be added as a MACHINE_FEATURES in local.conf like below:
>>
>> List of currently supported models:
>> - pitft22
>> + - pitft28r
>>
>>
>> 4. Extra apps
>> diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
>> index 792150e..a9e8053 100644
>> --- a/conf/machine/include/rpi-base.inc
>> +++ b/conf/machine/include/rpi-base.inc
>> @@ -33,6 +33,7 @@ KERNEL_DEVICETREE ?= " \
>> overlays/iqaudio-dacplus-overlay.dtb \
>> overlays/lirc-rpi-overlay.dtb \
>> overlays/pitft22-overlay.dtb \
>> + overlays/pitft28-resistive-overlay.dtb \
>> overlays/pps-gpio-overlay.dtb \
>> overlays/w1-gpio-overlay.dtb \
>> overlays/w1-gpio-pullup-overlay.dtb \
>> diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
>> index 4d41723..2941982 100644
>> --- a/recipes-bsp/bootfiles/rpi-config_git.bb
>> +++ b/recipes-bsp/bootfiles/rpi-config_git.bb
>> @@ -17,6 +17,7 @@ PR = "r4"
>>
>> 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)}"
>>
>> inherit deploy
>>
>> @@ -90,6 +91,11 @@ do_deploy() {
>> echo "# Enable PITFT22 display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
>> echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
>> fi
>> +
>> + if [ "${PITFT28r}" = "1" ]; then
>> + echo "# Enable PITFT28r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
>> + echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
>> + fi
>> }
>>
>> addtask deploy before do_package after do_install
>> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
>> new file mode 100644
>> index 0000000..0d2b36b
>> --- /dev/null
>> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
>> @@ -0,0 +1,5 @@
>> +Section "Device"
>> + Identifier "Adafruit PiTFT"
>> + Driver "fbdev"
>> + Option "fbdev" "/dev/fb1"
>> +EndSection
>> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
>> new file mode 100644
>> index 0000000..f8b578c
>> --- /dev/null
>> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
>> @@ -0,0 +1,6 @@
>> +Section "InputClass"
>> + Identifier "calibration"
>> + MatchProduct "stmpe-ts"
>> + Option "Calibration" "3800 200 200 3800"
>> + Option "SwapAxes" "1"
>> +EndSection
>> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
>> deleted file mode 100644
>> index 0d2b36b..0000000
>> --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
>> +++ /dev/null
>> @@ -1,5 +0,0 @@
>> -Section "Device"
>> - Identifier "Adafruit PiTFT"
>> - Driver "fbdev"
>> - Option "fbdev" "/dev/fb1"
>> -EndSection
>> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>> index 0ae2ee0..062de2d 100644
>> --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>> @@ -1,7 +1,8 @@
>> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>
>> SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \
>> - file://xorg.conf.d/99-pitft.conf \
>> + file://xorg.conf.d/98-pitft.conf \
>> + file://xorg.conf.d/99-calibration.conf \
>> "
>>
>> do_install_append_rpi () {
>> @@ -10,7 +11,8 @@ do_install_append_rpi () {
>>
>> PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
>> if [ "${PITFT}" = "1" ]; then
>> - install -m 0644 ${WORKDIR}/xorg.conf.d/99-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
>> + install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
>> + install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
>> fi
>> }
>>
>> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
>> index 24e7fe2..142ad7f 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi.inc
>> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
>> @@ -27,6 +27,8 @@ CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=ttyAMA0,11520
>>
>> UDEV_GE_141 ?= "1"
>>
>> +KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}"
>> +
>> # Set programmatically some variables during recipe parsing
>> # See http://www.yoctoproject.org/docs/current/bitbake-user-manual/bitbake-user-manual.html#anonymous-python-functions
>> python __anonymous () {
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r
2016-03-29 20:54 ` Petter Mabäcker
@ 2016-03-29 22:20 ` Andrei Gherzan
0 siblings, 0 replies; 8+ messages in thread
From: Andrei Gherzan @ 2016-03-29 22:20 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 8021 bytes --]
On Tue, Mar 29, 2016 at 10:54:42PM +0200, Petter Mabäcker wrote:
> On 03/29/2016 05:59 PM, Khem Raj wrote:
> >>On Mar 29, 2016, at 8:04 AM, Petter Mabäcker <petter@technux.se> wrote:
> >>
> >>The support for PiTFT 28 inch resistive touchscreen is optional
> >>and can be enabled by adding below in local.conf:
> >>
> >>MACHINE_FEATURES += "pitft pitft28r”
> >>
> >will this work with all kernel recipes available in layer ?
> It works on 3.18+. I just realized that 3.14 support was not removed when we
> took in 4.4 (so it will not work on that kernel). Since the general policy
> we have is to support three kernel versions; latest stable (4.4) + two
> longterm (4.1 and 3.18), I can send up a commit that removes 3.14 support in
> 'master' within this series.
>
> Thanks for your help to pointing this out!
>
That would definitely be a good idea. Good job!
> BR Petter
> >
> >
> >>Signed-off-by: Petter Mabäcker <petter@technux.se>
> >>---
> >>README | 1 +
> >>conf/machine/include/rpi-base.inc | 1 +
> >>recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++++
> >>.../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf | 5 +++++
> >>.../xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf | 6 ++++++
> >>.../xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf | 5 -----
> >>recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 6 ++++--
> >>recipes-kernel/linux/linux-raspberrypi.inc | 2 ++
> >>8 files changed, 25 insertions(+), 7 deletions(-)
> >>create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
> >>create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
> >>delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> >>
> >>diff --git a/README b/README
> >>index 536926b..54b1ac3 100644
> >>--- a/README
> >>+++ b/README
> >>@@ -232,6 +232,7 @@ the modelname should be added as a MACHINE_FEATURES in local.conf like below:
> >>
> >>List of currently supported models:
> >> - pitft22
> >>+ - pitft28r
> >>
> >>
> >>4. Extra apps
> >>diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
> >>index 792150e..a9e8053 100644
> >>--- a/conf/machine/include/rpi-base.inc
> >>+++ b/conf/machine/include/rpi-base.inc
> >>@@ -33,6 +33,7 @@ KERNEL_DEVICETREE ?= " \
> >> overlays/iqaudio-dacplus-overlay.dtb \
> >> overlays/lirc-rpi-overlay.dtb \
> >> overlays/pitft22-overlay.dtb \
> >>+ overlays/pitft28-resistive-overlay.dtb \
> >> overlays/pps-gpio-overlay.dtb \
> >> overlays/w1-gpio-overlay.dtb \
> >> overlays/w1-gpio-pullup-overlay.dtb \
> >>diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
> >>index 4d41723..2941982 100644
> >>--- a/recipes-bsp/bootfiles/rpi-config_git.bb
> >>+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
> >>@@ -17,6 +17,7 @@ PR = "r4"
> >>
> >>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)}"
> >>
> >>inherit deploy
> >>
> >>@@ -90,6 +91,11 @@ do_deploy() {
> >> echo "# Enable PITFT22 display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> >> echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> >> fi
> >>+
> >>+ if [ "${PITFT28r}" = "1" ]; then
> >>+ echo "# Enable PITFT28r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> >>+ echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> >>+ fi
> >>}
> >>
> >>addtask deploy before do_package after do_install
> >>diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
> >>new file mode 100644
> >>index 0000000..0d2b36b
> >>--- /dev/null
> >>+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
> >>@@ -0,0 +1,5 @@
> >>+Section "Device"
> >>+ Identifier "Adafruit PiTFT"
> >>+ Driver "fbdev"
> >>+ Option "fbdev" "/dev/fb1"
> >>+EndSection
> >>diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
> >>new file mode 100644
> >>index 0000000..f8b578c
> >>--- /dev/null
> >>+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
> >>@@ -0,0 +1,6 @@
> >>+Section "InputClass"
> >>+ Identifier "calibration"
> >>+ MatchProduct "stmpe-ts"
> >>+ Option "Calibration" "3800 200 200 3800"
> >>+ Option "SwapAxes" "1"
> >>+EndSection
> >>diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> >>deleted file mode 100644
> >>index 0d2b36b..0000000
> >>--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> >>+++ /dev/null
> >>@@ -1,5 +0,0 @@
> >>-Section "Device"
> >>- Identifier "Adafruit PiTFT"
> >>- Driver "fbdev"
> >>- Option "fbdev" "/dev/fb1"
> >>-EndSection
> >>diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> >>index 0ae2ee0..062de2d 100644
> >>--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> >>+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> >>@@ -1,7 +1,8 @@
> >>FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>
> >>SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \
> >>- file://xorg.conf.d/99-pitft.conf \
> >>+ file://xorg.conf.d/98-pitft.conf \
> >>+ file://xorg.conf.d/99-calibration.conf \
> >> "
> >>
> >>do_install_append_rpi () {
> >>@@ -10,7 +11,8 @@ do_install_append_rpi () {
> >>
> >> PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
> >> if [ "${PITFT}" = "1" ]; then
> >>- install -m 0644 ${WORKDIR}/xorg.conf.d/99-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> >>+ install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> >>+ install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> >> fi
> >>}
> >>
> >>diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
> >>index 24e7fe2..142ad7f 100644
> >>--- a/recipes-kernel/linux/linux-raspberrypi.inc
> >>+++ b/recipes-kernel/linux/linux-raspberrypi.inc
> >>@@ -27,6 +27,8 @@ CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=ttyAMA0,11520
> >>
> >>UDEV_GE_141 ?= "1"
> >>
> >>+KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}"
> >>+
> >># Set programmatically some variables during recipe parsing
> >># See http://www.yoctoproject.org/docs/current/bitbake-user-manual/bitbake-user-manual.html#anonymous-python-functions
> >>python __anonymous () {
> >>--
> >>1.9.1
> >>
> >>--
> >>_______________________________________________
> >>yocto mailing list
> >>yocto@yoctoproject.org
> >>https://lists.yoctoproject.org/listinfo/yocto
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
--
Andrei Gherzan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-03-29 22:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29 15:04 [meta-raspberrypi][PATCH 0/4] Various upgrade/fixes from Technux Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 1/4] pitft: Add support for pitft28r Petter Mabäcker
2016-03-29 15:59 ` Khem Raj
2016-03-29 20:54 ` Petter Mabäcker
2016-03-29 22:20 ` Andrei Gherzan
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 2/4] rpi-base.inc: Remove deprecated MACHINE_FEATURES Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 3/4] rpi-base.inc: Add overlay for rpi-ft5406 Petter Mabäcker
2016-03-29 15:04 ` [meta-raspberrypi][PATCH 4/4] .gitignore: Ignore some additional files Petter Mabäcker
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.