From 3008356286e02b5c71fd1904990f3e81443b52b8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 Sep 2017 10:01:32 +0300 Subject: warp7: use kernel that supports display and touch The new displays available from element14 are TRULY displays with synaptics touch, instead Himax. Task-number: QTBUG-63148 Change-Id: If8edf15e6ac25811d0157a250c748c77ee701ed8 Reviewed-by: Kari Hormi --- conf/distro/include/imx7s-warp.conf | 2 ++ .../recipes/linux/linux-warp7_4.1.bbappend | 10 ++++++++++ .../u-boot-fslc/0001-use-imx7d-warp.dtb.patch | 22 ++++++++++++++++++++++ .../recipes/u-boot/u-boot-fslc_%.bbappend | 1 + 4 files changed, 35 insertions(+) create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch diff --git a/conf/distro/include/imx7s-warp.conf b/conf/distro/include/imx7s-warp.conf index fdd7f17..1d30445 100644 --- a/conf/distro/include/imx7s-warp.conf +++ b/conf/distro/include/imx7s-warp.conf @@ -35,3 +35,5 @@ PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" DISTRO_FEATURES_remove = "webengine wayland" + +KERNEL_DEVICETREE = "imx7d-warp.dtb" diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend index 5efcce0..534af39 100644 --- a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend @@ -27,8 +27,18 @@ ## ############################################################################ +SRCBRANCH = "linux_4.1.29" +SRCREV = "881845d84e3c2e58a00b9c36616203d748b7df0e" +LOCALVERSION = "-warp7" + do_configure_prepend() { echo "CONFIG_NAMESPACES=y" >> ${B}/.config echo "CONFIG_FHANDLE=y" >> ${B}/.config echo "CONFIG_USB_FUNCTIONFS=m" >> ${B}/.config + + echo "CONFIG_MXC_CAMERA_OV2680_MIPI=m" >> ${B}/.config + echo "CONFIG_FB_MXC_TRULY_PANEL_TDO_ST7796H=y" >> ${B}/.config + echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE=y" >> ${B}/.config + echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV=y >> ${B}/.config + echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE=y >> ${B}/.config } diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch new file mode 100644 index 0000000..e8a0573 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch @@ -0,0 +1,22 @@ +From ef2f2eeef6974bda0fd878c5f76b8b05ac16aa3d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 13 Sep 2017 09:40:44 +0300 +Subject: [PATCH] use imx7d-warp.dtb + +--- + include/configs/warp7.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/configs/warp7.h b/include/configs/warp7.h +index b3e1f2e..edbd43f 100644 +--- a/include/configs/warp7.h ++++ b/include/configs/warp7.h +@@ -35,7 +35,7 @@ + "ethact=usb_ether\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=imx7s-warp.dtb\0" \ ++ "fdt_file=imx7d-warp.dtb\0" \ + "fdt_addr=0x83000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend index c5201a0..b1df421 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend @@ -31,4 +31,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Updated-kernel-arguments-for-sabre-sd.patch \ file://0001-Use-hdmi-as-primary-display-only-if-connected.patch \ + file://0001-use-imx7d-warp.dtb.patch \ " -- cgit v1.2.3-54-g00ecf