summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-01-04 14:28:56 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-01-09 08:07:31 +0000
commit500e3a9564f232683a215dc685bc00d5a5d9d719 (patch)
tree9370ade20d8ca32c7cd0faa4dbc5a06ceee70c2e
parent7be800244c9fa56550fddc0e9f00fa1df375c8c7 (diff)
downloadmeta-boot2qt-500e3a9564f232683a215dc685bc00d5a5d9d719.tar.gz
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 <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt-distro/conf/distro/include/boundary.inc4
-rw-r--r--meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch21
-rw-r--r--meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend1
-rw-r--r--scripts/manifest.xml6
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 @@
30include conf/distro/include/fsl.inc 30include conf/distro/include/fsl.inc
31 31
32BBMASK += " \ 32BBMASK += " \
33 meta-boundary/recipes-browser/chromium \
34 meta-boundary/recipes-core/init-ifupdown \ 33 meta-boundary/recipes-core/init-ifupdown \
35 meta-boundary/recipes-mozilla/firefox \
36 " 34 "
37 35
38MACHINE_EXTRA_INSTALL += "\ 36MACHINE_EXTRA_INSTALL += "\
39 kernel-module-qcacld \ 37 kernel-module-qcacld \
40 linux-firmware-bdsdmac-wlan \ 38 linux-firmware-bdsdmac \
41 " 39 "
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 @@
1From 524e178f97a72e9dbc81486b1af44c5749bc698b Mon Sep 17 00:00:00 2001 1From c1099dfa376de7bf16763dee364698078f015848 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 27 Jan 2016 13:07:39 +0200 3Date: Wed, 27 Jan 2016 13:07:39 +0200
4Subject: [PATCH] Add support for koe tx31d200vm0baa display 4Subject: [PATCH] Add support for koe tx31d200vm0baa display
@@ -8,20 +8,20 @@ Subject: [PATCH] Add support for koe tx31d200vm0baa display
8 1 file changed, 12 insertions(+) 8 1 file changed, 12 insertions(+)
9 9
10diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 10diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
11index 1a2a358..de01d23 100644 11index efbe51d..3704e14 100644
12--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 12--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
13+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 13+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
14@@ -393,6 +393,7 @@ 14@@ -498,6 +498,7 @@
15 mxcfb1 = &fb_lvds; 15 pwm_lvds = &pwm4;
16 mxcfb2 = &fb_lcd; 16 rtc1 = &snvs_rtc;
17 t_lvds = &t_lvds; 17 t_lvds = &t_lvds;
18+ koe = &koe; 18+ koe = &koe;
19 }; 19 };
20 20
21 clocks { 21 backlight_lcd: backlight_lcd {
22@@ -955,6 +956,17 @@ 22@@ -1075,6 +1076,17 @@
23 hsync-len = <96>; 23 hsync-len = <32>;
24 vsync-len = <2>; 24 vsync-len = <6>;
25 }; 25 };
26+ koe: tx31d200vm0baa { 26+ koe: tx31d200vm0baa {
27+ clock-frequency = <28000000>; 27+ clock-frequency = <28000000>;
@@ -37,6 +37,3 @@ index 1a2a358..de01d23 100644
37 }; 37 };
38 }; 38 };
39 }; 39 };
40--
411.9.1
42
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 += " \
36RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" 36RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
37 37
38do_preconfigure_prepend() { 38do_preconfigure_prepend() {
39 echo "CONFIG_HID_MULTITOUCH=m" >> ${WORKDIR}/defconfig
40 echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig 39 echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig
41} 40}
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 @@
35 35
36 <project name="meta-freescale" 36 <project name="meta-freescale"
37 remote="freescale" 37 remote="freescale"
38 revision="2813c0c59a81498afab26a2b1f90db07728df2ed" 38 revision="407c6cf408969445031a492e2d25e0e2749582ea"
39 path="sources/meta-freescale" 39 path="sources/meta-freescale"
40 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> 40 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
41 <project name="meta-freescale-3rdparty" 41 <project name="meta-freescale-3rdparty"
42 remote="freescale" 42 remote="freescale"
43 revision="ba684412e6983eeda0ef7158a724305f0f1a2f0a" 43 revision="88a29631809d1af0df618245430db29f2a7012b5"
44 path="sources/meta-freescale-3rdparty" 44 path="sources/meta-freescale-3rdparty"
45 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> 45 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
46 <project name="meta-raspberrypi" 46 <project name="meta-raspberrypi"
@@ -85,7 +85,7 @@
85 groups="notdefault,external,toradex"/> 85 groups="notdefault,external,toradex"/>
86 <project name="meta-boundary" 86 <project name="meta-boundary"
87 remote="boundary" 87 remote="boundary"
88 revision="107a7ceba84b87e1e2a463fea27ae5c53c4e452f" 88 revision="412ef0b92df0575808c2292cc4983e118c1a19f8"
89 path="sources/meta-boundary" 89 path="sources/meta-boundary"
90 groups="notdefault,external,boundary"/> 90 groups="notdefault,external,boundary"/>
91 <project name="meta-fsl-bsp-release" 91 <project name="meta-fsl-bsp-release"