From 500e3a9564f232683a215dc685bc00d5a5d9d719 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 4 Jan 2019 14:28:56 +0200 Subject: meta-freescale,-freescale-3rdparty,-boundary: update sumo branches Cleanup: - Obsolete BBMASK entries removed & required BT/WiFi kernel module related updates in boundary.inc - "CONFIG_HID_MULTITOUCH=m" removed from fsl-extras .bbappend entry as linux-boundary-4.9.x/defconfig in meta-freescale-3rdparty already includes it - Update display support patch Changelog: meta-freescale: * 407c6cf - u-boot-fslc: Avoid restricting parsing for 'imx' * c8979aa - mxldr: Fix QA errors seen on x86 builds * 4f0cbb6 - recipes: Limit BSP specific recipes on relevant SOCs * d849257 - recipes: Mark compatible machines as restricted by dependencies * e4ace33 - linux-fslc/defconfig: sync with linux-fslc imx_v6_v7_defconfig * 7909951 - libsdl2: avoid basehash changes * 06611d2 - linux-fslc/defconfig: CONFIG_BT_BNEP=m * 808bc8a - linux-fslc/defconfig: Add CONFIG_NET_NS=y * 42dbe4e - imx-base.inc Add missing overrides to for `use-mainline-bsp` * 832b358 - linux-fslc/defconfig: Add CONFIG_FW_LOADER_USER_HELPER(_FALLBACK)=y * aa04351 - linux-fslc: upgrade to latest in 4.17.x+fslc * 196457d - linux-fslc: Update to 4.17.19 * 85fc83d - xf86-video-armada: Update to latest git * 9e3d514 - imx-alsa-plugins: Make imx7ulp a compatible machine * aa71828 - qtwayland/etnaviv: remove xcomposite-glx * 3d89831 - remove chromium appends * a4512f2 - xf86-video-imx-vivante: Set linker flags properly * 1deea6b - linux-fslc/defconfig: Add CONFIG_TMPFS_POSIX_ACL=y * 07e2673 - linux-fslc: Update SRCREV meta-freescale-3rdparty: * 88a2963 - linux-advantech: Update dms-ba16 Q7 Linux kernel * beed0f0 - u-boot-script-gateworks-imx: fix bootscript source meta-boundary: * 412ef0b - boundary-eval-image: include qcacld/bdsdmac wifi firmware * b649eaf - linux-firmware-bdsdmac: merge BT and WiFi firmware recipes * d6ba89a - devregs: bump revision to 24723266 * 1a58771 - kernel-module-qcacld: bump revision to 10a07db2 * 0c34f6f - linux-firmware-bdsdmac-wlan: bump to revision ce0b576b Task-number: QTBUG-72253 Change-Id: Id99b0d5396c34721845d0133ad7c01dff8b1bfa0 Reviewed-by: Samuli Piippo --- .../conf/distro/include/boundary.inc | 4 +--- ...Add-support-for-koe-tx31d200vm0baa-display.patch | 21 +++++++++------------ .../recipes/linux/linux-boundary_4.%.bbappend | 1 - scripts/manifest.xml | 6 +++--- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc index b08e11a..8dcf16b 100644 --- a/meta-boot2qt-distro/conf/distro/include/boundary.inc +++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc @@ -30,12 +30,10 @@ include conf/distro/include/fsl.inc BBMASK += " \ - meta-boundary/recipes-browser/chromium \ meta-boundary/recipes-core/init-ifupdown \ - meta-boundary/recipes-mozilla/firefox \ " MACHINE_EXTRA_INSTALL += "\ kernel-module-qcacld \ - linux-firmware-bdsdmac-wlan \ + linux-firmware-bdsdmac \ " diff --git a/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch index e8ac286..7851ca4 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch +++ b/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch @@ -1,4 +1,4 @@ -From 524e178f97a72e9dbc81486b1af44c5749bc698b Mon Sep 17 00:00:00 2001 +From c1099dfa376de7bf16763dee364698078f015848 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 27 Jan 2016 13:07:39 +0200 Subject: [PATCH] Add support for koe tx31d200vm0baa display @@ -8,20 +8,20 @@ Subject: [PATCH] Add support for koe tx31d200vm0baa display 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi -index 1a2a358..de01d23 100644 +index efbe51d..3704e14 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi -@@ -393,6 +393,7 @@ - mxcfb1 = &fb_lvds; - mxcfb2 = &fb_lcd; +@@ -498,6 +498,7 @@ + pwm_lvds = &pwm4; + rtc1 = &snvs_rtc; t_lvds = &t_lvds; + koe = &koe; }; - clocks { -@@ -955,6 +956,17 @@ - hsync-len = <96>; - vsync-len = <2>; + backlight_lcd: backlight_lcd { +@@ -1075,6 +1076,17 @@ + hsync-len = <32>; + vsync-len = <6>; }; + koe: tx31d200vm0baa { + clock-frequency = <28000000>; @@ -37,6 +37,3 @@ index 1a2a358..de01d23 100644 }; }; }; --- -1.9.1 - diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend index 9bf3498..ff0a0d2 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend @@ -36,6 +36,5 @@ SRC_URI += " \ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" do_preconfigure_prepend() { - echo "CONFIG_HID_MULTITOUCH=m" >> ${WORKDIR}/defconfig echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig } diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 7a87ac6..1057a45 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -35,12 +35,12 @@