diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-06-05 13:56:35 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-06-05 20:48:24 +0000 |
| commit | acbae7dc3d56800e68700b8f14515db6c34d337f (patch) | |
| tree | 79189d30d6e3197d969a5aca95c3ca180941bdac /meta-agl-bsp | |
| parent | f77ccbb7501f3a63b4d879dcb3c5c0cfcf4e8b6f (diff) | |
Use new weston-ini-conf scheme and remove old per-machine files
The previous commit used an old file. Use the new generated version.
Bug-AGL: SPEC-4822
Change-Id: Ic1b7018ce2840332c0e051101ce854b90f96ecae
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28985
Tested-by: Jenkins Job builder account
Diffstat (limited to 'meta-agl-bsp')
4 files changed, 3 insertions, 21 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc index 3fdc68b2c..7fd878d66 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -29,3 +29,6 @@ IMAGE_INSTALL:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', 'xen-tools # Add xen-raspberry binary to boot files IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" + +#DISPLAY CONFIGURATION +WESTON_DISPLAYS:raspberrypi4 = " hdmi-a-1-90 hdmi-a-2-90" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend deleted file mode 100644 index 9e50a75b8..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS:prepend:raspberrypi := "${THISDIR}/${PN}:" - -# OLD DSI config -#SRC_URI:append:raspberrypi = " file://dsi.cfg" - -# two hdmi ports -SRC_URI:append:raspberrypi = " file://hdmi-dual.cfg" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf/dsi.cfg b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf/dsi.cfg deleted file mode 100644 index ed6a4ed90..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf/dsi.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# Support the Raspberry Pi Foundation 7" tablet which uses the DSI connector -# rather than HDMI. -[output] -name=DSI-1 -transform=rotate-90 diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf/hdmi-dual.cfg b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf/hdmi-dual.cfg deleted file mode 100644 index 61d1362bb..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf/hdmi-dual.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Support the Raspberry Pi Foundation 7" tablet which uses the DSI connector -# rather than HDMI. -[output] -name=HDMI-A-1 -transform=rotate-90 - -[output] -name=HDMI-A-2 -transform=rotate-90 |