aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland/weston-init.bbappend
AgeCommit message (Collapse)Author
2023-10-31weston-init: Set gbm-format for 93Tom Hochstein
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-07-17weston-init: Don't add use-g2d where not supportedTom Hochstein
The logic adding use-g2d to weston.ini adds a commented version for builds without G2D support. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-06-07weston-init: disable xwayland for mainline BSPsMing Liu
A regression was introduced by commit 47f0410be1: [ weston-init: Rework weston.ini configuration ] xwayland had been dropped from weston.ini for mainline BSPs before that commit, since it's not supported by mainline BSPs: [ weston-init: comment in xwayland=true for mainline BSPs The main recipe now sets xwayland=true in weston.ini, but xwayland does not really work for mainline BSPs, the following error was observed on both imx6/imx7 machines, as follows: ``` | # gst-play-1.0 testvideo_h264_360p.mp4 | Press 'k' to see a list of keyboard shortcuts. | Now playing testvideo_h264_360p.mp4 | X connection to :0.0 broken (explicit kill or server shutdown). ``` after removing "xwayland=true" from weston.ini, it works again. This patch mainly aims to resolve this problem by introducing a variable INI_COMMENT_ASSIGNMENTS that the end users could set to comment a line in weston.ini. ] but after commit 47f0410be1, "xwayland=true" is added back again to weston.ini. Introduce a xwayland PACKAGECONFIG to control that, drop it from weston.ini for mainline BSPs. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
2023-05-18weston-init: Drop rdp default supportTom Hochstein
Including rdp support is costly since it pulls in `freerdp`, which pulls in `gstreamer`. Don't include it by default. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-05-18weston-init: Use G2D on i.MX 93Tom Hochstein
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-05-18weston-init: Adjust use-g2d for weston 11Tom Hochstein
For the weston 11 fork, the use-g2d option type is changed from an integer to a boolean. Handle both cases. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-05-18weston-init: Rework weston.ini configurationTom Hochstein
The main recipe has a different mechanism for customizing weston.ini. Rework our mechanism to follow. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-04-28weston-init: comment in xwayland=true for mainline BSPsMing Liu
The main recipe now sets xwayland=true in weston.ini, but xwayland does not really work for mainline BSPs, the following error was observed on both imx6/imx7 machines, as follows: ``` | # gst-play-1.0 testvideo_h264_360p.mp4 | Press 'k' to see a list of keyboard shortcuts. | Now playing testvideo_h264_360p.mp4 | X connection to :0.0 broken (explicit kill or server shutdown). ``` after removing "xwayland=true" from weston.ini, it works again. This patch mainly aims to resolve this problem by introducing a variable INI_COMMENT_ASSIGNMENTS that the end users could set to comment a line in weston.ini. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
2022-12-20weston-init: Correct override of INI_UNCOMMENT_ASSIGNMENTSJun Zhu
current implement only includes INI_UNCOMMENT_USE_G2D to INI_UNCOMMENT_ASSIGNMENTS on the platforms with VIV G2D hardware. Signed-off-by: Jun Zhu <junzhu@nxp.com>
2022-12-15weston-init: Drop redundant xwayland=true settingTom Hochstein
The main recipe now sets xwayland=true in weston.ini, so drop it from here. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2022-03-31mx8dx: Normalize MACHINEOVERRIDES implementationTom Hochstein
The imx8dx-mek machine is similar to imx8qxp-mek and so the mx8qxp override was included in the MACHINEOVERRIDES hierarchy. This is non-standard, and the rework of the SOC overrides didn't handle it properly, leading to a build break: ``` Log data follows: | DEBUG: Executing shell function do_compile | NOTE: 8QX boot binary build | cp: failed to access '/home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin': Not a directory | WARNING: /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636:179 exit 1 from 'cp /home/aquino/src/ossystems/oel-platform/build/tmp/deploy/images/imx8dx-mek/imx-boot$ tools/scfw_tcm.bin /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin' | WARNING: Backtrace (BB generated script): | #1: compile_mx8x, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 179 | #2: do_compile, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 151 | #3: main, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 189 ERROR: Task (/home/aquino/src/ossystems/oel-platform/sources/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_1.0.bb:do_compile) failed with exit code '1' ``` Fix the problem by removing mx8qxp from the mx8dx hierarchy and adapting existing mx8qxp overrides appropriately. Fixes: #1027 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2022-03-15Revert "weston-init: fix some invalid overrides"Tom Hochstein
There is a root cause to this that will be fixed instead. This reverts commit 6be9870b5057cf122cecb2716583169b39de78ae.
2022-03-13weston-init: fix some invalid overridesMing Liu
The mx8qm-nxp-bsp/mx8qxp-nxp-bsp overrides would not work because imxgpu2d would take effect in the end since it has higher priority in MACHINEOVERRIDES. Append mx8qm-nxp-bsp/mx8qxp-nxp-bsp after imxgpu2d can fix the problem. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
2022-02-21Generalize overrides subsystem for NXP and Mainline supportOtavio Salvador
Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and mainline-bsp. So, for example, the mx8mq override is split into: - imx-generic-bsp: compatible with every i.MX SoC and both BSP variants - imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP - imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP - mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants - mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP - mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP - mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants - mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP - mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP - mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants - mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP - mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP The extender mechanism is responsible for extending the override list to include the generic overrides. We can then use the three different variants to handle the metadata correctly. Generically speaking, the conversion mainly was automated (with a lot of back and forth until getting it right). To convert an existing layer, the following script can be used: ```sh git ls-files classes recipes-* \ | xargs sed -i \ -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \ -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \ -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \ -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \ \ -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \ -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \ -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(vf\w*\),:\1-generic-bsp,g' \ -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \ -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \ -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \ -e 's,(\(imx\)),(\1-nxp-bsp),g' \ -e 's,\(imx\)|,\1-nxp-bsp|,g' \ -e 's,|\(imx\)),|\1-nxp-bsp),g' for d in $(find -type d | egrep '/mx[6-8]w*'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/imx$'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/mx[5s]w*'); do git mv $d $d-generic-bsp done ``` Fixes: #791. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-02-11weston-init: Set bindir properly in weston.iniTom Hochstein
The customized weston.ini is installed in the rootfs with an unresolved bindir variable. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2021-08-12layer: More override fixesTom Hochstein
Adds fixes for _imx, _imxdpu, _imxdrm, _imxgpu, _imxgpu3d, virtual PREFERRED_PROVIDER versions Fix other places for imx/imxdpu/imxdrm overrides Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-08-12layer: Convert to new override syntaxKhem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-05-19weston-init: uncomment use-g2d=1 based on imxgpu2d MACHINEOVERRIDEChris Dimich
affects the following SoCs: -mx6q -mx6dl -mx6sx -mx6sl -mx7ulp -mx8qm -mx8mm -mx8mp -mx8qxp Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
2021-04-14weston-init: Do not exit with error if uncomment function failFabio Berton
Show a warning instead of raising an error when uncomment function can't found the text. This allows using a custom weston.ini file in bbappend. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2021-04-13weston-init: Rework uncomment function logicVinicius Aquino
Fix error "Commented setting '#use-g2d=1' not found" when building for some imx machines. Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
2021-02-11weston-init: Update weston.iniTom Hochstein
- Add repaint-window for all i.MX 8 to support 4K display - Add enable-overlay-view option as comment - Enable touchscreen_calibrator - Update transform values which were re-worked for weston 9.0 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2021-01-31weston-init: enable g2d for mx6dl/mxq machinesPierluigi Passaro
Both the machines do support g2d and this fix graphical artifacts when using a mouse Signed-off-by: Pierluigi Passaro <pierluigi.p@variscite.com>
2020-09-29weston-init: add weston.ini section to support imx8mpAndrey Zhizhikin
Allow usage of 2D blit accelerator present in imx8mp soc Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
2020-07-23Revert "weston-init: use g2d for i.MX8M Nano SoC"Tom Hochstein
8M Nano does not have 2D acceleration. This reverts commit b3f51ab82838a67146d5b6fcf8f19d36c5efeb37.
2020-03-03weston-init.bbappend: Fix missing space in variable assignmentTom Hochstein
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2020-01-08weston-init: use g2d for i.MX8M Nano SoCAndrey Zhizhikin
Use 2D acceleration for i.MX8M Nano SoC. Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
2019-11-19weston-init: Keep the logic to edit weston.ini to meta-freescaleKhem Raj
This logic does not work across multiple layers even OE-Core machines dont build with it. For now its best to keep this confined to meta-freescale machines Idea is good but it needs to align with OE-core's methods where currently in OE-Core we expect machines to override weston.ini completely per machine, this logic sort of goes against it. However it has some goodness to it, eg. adding options based on DISTRO_FEATURES which OE-Core could have too but maybe implemented differently. Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-18weston: Move xwayland config to weston.iniTom Hochstein
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2019-11-18weston: Replace copies of weston.ini with logicTom Hochstein
Install a common base weston.ini and then customize it in the recipe by specifying custom options. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2019-09-21weston-init: Adjust to match recent oe-core changesKhem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-05weston-init: Fix inoperable Weston desktopTom Hochstein
For an image configured with pam and systemd, Weston apps would fail to run. For example: $ weston-terminal failed to connect to Wayland display: No such file or directory failed to create display: No such file or directory This fix is based on a proposal by Daniel Diaz to OE-core. The main part of the fix is the use of a new, manually created tty. The original proposal called weston directly, but that didn't seem to work where weston-launch did. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-07-05weston-init: Remove OpenGL requirement for i.MX 6SLTom Hochstein
For parts with 2D GPU but not 3D GPU, OpenGL is not required. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>