diff options
30 files changed, 33 insertions, 634 deletions
diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc new file mode 100644 index 000000000..44d41c15e --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc @@ -0,0 +1,20 @@ +DISTRO_FEATURES_append = " agl-medium-arm-compiler" + +# Caution: Hand-merge needed when original recipes are updated +# +# Here we only have selected lines from the following (and +# their included) files +# +# fslc-wayland.conf +# fsl-image-multimedia-full.bb +# + +# fix build error +SECURITY_CFLAGS_pn-devil = "${SECURITY_NO_PIE_CFLAGS}" + +# since krogoth, u-boot-fslc does not seem to handle imx6qsabreauto correctly +PREFERRED_PROVIDER_u-boot = "u-boot-imx" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" +PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx" + +#PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" diff --git a/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc deleted file mode 100644 index d1febfb40..000000000 --- a/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc +++ /dev/null @@ -1,47 +0,0 @@ -# Caution: Hand-merge needed when original recipes are updated -# -# Here we only have selected lines from the following (and -# their included) files -# -# fslc-wayland.conf -# fsl-image-multimedia-full.bb -# - -# fslc-wayland.conf - -# -# Followings were intentionally removed from the original recipe -# to make our set simpler -# -# gtk+3-demo clutter-1.0-examples -# - -IMAGE_INSTALL_append = " \ - packagegroup-fsl-tools-gpu \ - packagegroup-fsl-gstreamer1.0 \ - packagegroup-imx-tools-audio \ - weston weston-init weston-examples \ -" - -# fsl-image-multimedia-full.bb - -IMAGE_INSTALL_append = " \ - packagegroup-fsl-gstreamer1.0-full \ -" - -# fix build error - -SECURITY_CFLAGS_pn-devil = "${SECURITY_NO_PIE_CFLAGS}" - -# since krogoth, u-boot-fslc does not seem to handle imx6qsabreauto correctly - -PREFERRED_PROVIDER_u-boot = "u-boot-imx" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" -PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx" - -# force generate sdcard image also - -AGL_DEFAULT_IMAGE_FSTYPES = "sdcard.xz" -AGL_DEFAULT_INITRAMFS_FSTYPES := "" - -PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" diff --git a/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc b/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc deleted file mode 100644 index e686a4060..000000000 --- a/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc +++ /dev/null @@ -1,39 +0,0 @@ -IMAGE_INSTALL_append = " \ - packagegroup-fsl-tools-gpu \ - packagegroup-fsl-gstreamer1.0 \ - packagegroup-imx-tools-audio \ - weston weston-init weston-examples \ -" - -# fsl-image-multimedia-full.bb -IMAGE_INSTALL_append = " \ - packagegroup-fsl-gstreamer1.0-full \ -" - -# prevent of build errors from missing bb files -BBMASK = "meta-boundary/recipes-(browser|mozilla)" - -# fix build error -SECURITY_CFLAGS_pn-devil = "${SECURITY_NO_PIE_CFLAGS}" - -PREFERRED_PROVIDER_virtual/kernel = "linux-boundary" - -PREFERRED_PROVIDER_u-boot = "u-boot-boundary" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary" -PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-boundary" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ - u-boot-boundary \ - u-boot-script-boundary \ -" - -UBOOT_MACHINE = "nitrogen6q_config" -SPL_BINARY = "" -UBOOT_SUFFIX_SDCARD = "imx" -IMAGE_BOOTLOADER = "u-boot" - -# generate WIC image also -WKS_FILE = "imx-uboot.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" -AGL_DEFAULT_INITRAMFS_FSTYPES := "" - -PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc deleted file mode 100644 index 642fe423c..000000000 --- a/meta-agl-bsp/conf/include/agl_joule.inc +++ /dev/null @@ -1,14 +0,0 @@ -INTEL_MACHINE_SUBTYPE = "broxton-m" - -IMAGE_INSTALL_append = " linux-firmware-iwlwifi-8000c linux-firmware-ibt" -IMAGE_INSTALL_append = " \ - libva \ - intel-vaapi-driver \ - gstreamer1.0-vaapi" -OSTREE_BOOTLOADER ?= "u-boot" - -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" -INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" -# Modify this file under meta-agl-bsp/meta-intel/wic to change the -# kernel command line -WKS_FILE = "systemd-joule-bootdisk.wks" diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc deleted file mode 100644 index 9f2345330..000000000 --- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ /dev/null @@ -1,10 +0,0 @@ -PREFERRED_PROVIDER_u-boot = "u-boot-imx6" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx6" -PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx6" - -AGL_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" - -# prevent of build errors from missing bb files -BBMASK = "meta-boundary/recipes-(browser|mozilla)" - -PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc deleted file mode 100644 index a474652e1..000000000 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ /dev/null @@ -1,47 +0,0 @@ -# Maximum memory allowed to be assigned -GPU_MEM = "255" - -ENABLE_CMA = "1" -CMA_LWM = "16" -CMA_HWM = "32" - -CORE_IMAGE_EXTRA_INSTALL += "wayland weston" - -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" - -KERNEL_IMAGETYPE = "uImage" -KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" -PREFERRED_VERSION_mesa = "12.%" - -PREFERRED_PROVIDER_virtual/egl = "mesa" -PREFERRED_PROVIDER_virtual/libgles2 = "mesa" -PREFERRED_PROVIDER_virtual/libgl = "mesa" -PREFERRED_PROVIDER_virtual/mesa = "mesa" -PREFERRED_PROVIDER_jpeg = "jpeg" - -MACHINE_FEATURES += "vc4graphics" - -# For libomxil -#LICENSE_FLAGS_WHITELIST = "commercial" - -IMAGE_INSTALL_append = " kernel-modules linux-firmware " - -# Psplash causes crash on first boot on RPi -IMAGE_FEATURES_remove = "splash" - -# Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES_append = " sota" - -# Create WIC images to write to SD cards. -WKS_FILE = "sdimage-raspberrypi.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" -IMAGE_BOOT_FILES = "bcm2835-bootfiles/* \ - ${@make_dtb_boot_files(d)} \ - ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \ - '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ - '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ - " -do_image_wic[depends] += " \ - bcm2835-bootfiles:do_deploy \ - ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot:do_deploy', '',d)} \ - " diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0001-libweston-Restore-EGL-support-for-the-fbdev-backend.patch b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0001-libweston-Restore-EGL-support-for-the-fbdev-backend.patch deleted file mode 100644 index 77bf2c5cb..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0001-libweston-Restore-EGL-support-for-the-fbdev-backend.patch +++ /dev/null @@ -1,250 +0,0 @@ -From c43b64cad0fdc55594434a68faa25447b50ca7c5 Mon Sep 17 00:00:00 2001 -From: Georgi Vlaev <georgi.vlaev@konsulko.com> -Date: Wed, 27 Sep 2017 14:00:50 +0300 -Subject: [PATCH 1/5] libweston: Restore EGL support for the fbdev backend - -In Weston 2.0, the EGL support was dropped from the fbdev-backend, -as that was not the correct way to initialize the EGL in first -place. However, the vendor support patches in Weston 1.11 still -require that functionality. Teporary restore the EGL support in -the fbdev-backend, until a separate vendor backend is available, -or switch to using etnaviv. - -Signed-off-by: Georgi Vlaev <georgi.vlaev@konsulko.com> ---- - compositor/main.c | 2 + - libweston/compositor-fbdev.c | 99 +++++++++++++++++++++++++++++++++++++------- - libweston/compositor-fbdev.h | 1 + - 3 files changed, 87 insertions(+), 15 deletions(-) - -diff --git a/compositor/main.c b/compositor/main.c -index 72c3cd10..6c45a018 100644 ---- a/compositor/main.c -+++ b/compositor/main.c -@@ -574,6 +574,7 @@ usage(int error_code) - "Options for fbdev-backend.so:\n\n" - " --tty=TTY\t\tThe tty to use\n" - " --device=DEVICE\tThe framebuffer device to use\n" -+ " --use-gl\t\tUse the GL renderer\n" - "\n"); - #endif - -@@ -1444,6 +1445,7 @@ load_fbdev_backend(struct weston_compositor *c, - const struct weston_option fbdev_options[] = { - { WESTON_OPTION_INTEGER, "tty", 0, &config.tty }, - { WESTON_OPTION_STRING, "device", 0, &config.device }, -+ { WESTON_OPTION_BOOLEAN, "use-gl", 0, &config.use_gl }, - }; - - parse_options(fbdev_options, ARRAY_LENGTH(fbdev_options), argc, argv); -diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c -index 44f0cf51..4ca53b67 100644 ---- a/libweston/compositor-fbdev.c -+++ b/libweston/compositor-fbdev.c -@@ -49,6 +49,7 @@ - #include "launcher-util.h" - #include "pixman-renderer.h" - #include "libinput-seat.h" -+#include "gl-renderer.h" - #include "presentation-time-server-protocol.h" - - struct fbdev_backend { -@@ -58,6 +59,7 @@ struct fbdev_backend { - - struct udev *udev; - struct udev_input input; -+ int use_pixman; - uint32_t output_transform; - struct wl_listener session_listener; - }; -@@ -94,6 +96,8 @@ struct fbdev_output { - uint8_t depth; - }; - -+struct gl_renderer_interface *gl_renderer; -+ - static const char default_seat[] = "seat0"; - - static inline struct fbdev_output * -@@ -117,8 +121,8 @@ fbdev_output_start_repaint_loop(struct weston_output *output) - weston_output_finish_frame(output, &ts, WP_PRESENTATION_FEEDBACK_INVALID); - } - --static int --fbdev_output_repaint(struct weston_output *base, pixman_region32_t *damage) -+static void -+fbdev_output_repaint_pixman(struct weston_output *base, pixman_region32_t *damage) - { - struct fbdev_output *output = to_fbdev_output(base); - struct weston_compositor *ec = output->base.compositor; -@@ -140,6 +144,26 @@ fbdev_output_repaint(struct weston_output *base, pixman_region32_t *damage) - * refresh rate is given in mHz and the interval in ms. */ - wl_event_source_timer_update(output->finish_frame_timer, - 1000000 / output->mode.refresh); -+} -+ -+static int -+fbdev_output_repaint(struct weston_output *base, pixman_region32_t *damage) -+{ -+ struct fbdev_output *output = to_fbdev_output(base); -+ struct fbdev_backend *backend = output->backend; -+ struct weston_compositor *ec = backend->compositor; -+ -+ if (backend->use_pixman) { -+ fbdev_output_repaint_pixman(base,damage); -+ } else { -+ ec->renderer->repaint_output(base, damage); -+ /* Update the damage region. */ -+ pixman_region32_subtract(&ec->primary_plane.damage, -+ &ec->primary_plane.damage, damage); -+ -+ wl_event_source_timer_update(output->finish_frame_timer, -+ 1000000 / output->mode.refresh); -+ } - - return 0; - } -@@ -440,16 +464,30 @@ fbdev_output_enable(struct weston_output *base) - return -1; - } - -- if (fbdev_frame_buffer_map(output, fb_fd) < 0) { -- weston_log("Mapping frame buffer failed.\n"); -- return -1; -- } -+ if (backend->use_pixman) { -+ if (fbdev_frame_buffer_map(output, fb_fd) < 0) { -+ weston_log("Mapping frame buffer failed.\n"); -+ return -1; -+ } -+ } else -+ close(fb_fd); - - output->base.start_repaint_loop = fbdev_output_start_repaint_loop; - output->base.repaint = fbdev_output_repaint; - -- if (pixman_renderer_output_create(&output->base) < 0) -- goto out_hw_surface; -+ if (backend->use_pixman) { -+ if (pixman_renderer_output_create(&output->base) < 0) -+ goto out_hw_surface; -+ } else { -+ setenv("HYBRIS_EGLPLATFORM", "wayland", 1); -+ if (gl_renderer->output_window_create(&output->base, -+ (EGLNativeWindowType)NULL, NULL, -+ gl_renderer->opaque_attribs, -+ NULL, 0) < 0) { -+ weston_log("gl_renderer_output_create failed.\n"); -+ goto out_hw_surface; -+ } -+ } - - loop = wl_display_get_event_loop(backend->compositor->wl_display); - output->finish_frame_timer = -@@ -534,14 +572,19 @@ static void - fbdev_output_destroy(struct weston_output *base) - { - struct fbdev_output *output = to_fbdev_output(base); -+ struct fbdev_backend *backend = output->backend; - - weston_log("Destroying fbdev output.\n"); - - /* Close the frame buffer. */ - fbdev_output_disable(base); - -- if (base->renderer_state != NULL) -- pixman_renderer_output_destroy(base); -+ if (backend->use_pixman) { -+ if (base->renderer_state != NULL) -+ pixman_renderer_output_destroy(base); -+ } else { -+ gl_renderer->output_destroy(base); -+ } - - /* Remove the output. */ - weston_output_destroy(&output->base); -@@ -610,9 +653,11 @@ fbdev_output_reenable(struct fbdev_backend *backend, - } - - /* Map the device if it has the same details as before. */ -- if (fbdev_frame_buffer_map(output, fb_fd) < 0) { -- weston_log("Mapping frame buffer failed.\n"); -- goto err; -+ if (backend->use_pixman) { -+ if (fbdev_frame_buffer_map(output, fb_fd) < 0) { -+ weston_log("Mapping frame buffer failed.\n"); -+ goto err; -+ } - } - - return 0; -@@ -628,9 +673,13 @@ static void - fbdev_output_disable(struct weston_output *base) - { - struct fbdev_output *output = to_fbdev_output(base); -+ struct fbdev_backend *backend = output->backend; - - weston_log("Disabling fbdev output.\n"); - -+ if (!backend->use_pixman) -+ return; -+ - if (output->hw_surface != NULL) { - pixman_image_unref(output->hw_surface); - output->hw_surface = NULL; -@@ -744,11 +793,30 @@ fbdev_backend_create(struct weston_compositor *compositor, - backend->base.restore = fbdev_restore; - - backend->prev_state = WESTON_COMPOSITOR_ACTIVE; -+ backend->use_pixman = !param->use_gl; - - weston_setup_vt_switch_bindings(compositor); - -- if (pixman_renderer_init(compositor) < 0) -- goto out_launcher; -+ if (backend->use_pixman) { -+ if (pixman_renderer_init(compositor) < 0) -+ goto out_launcher; -+ } else { -+ gl_renderer = weston_load_module("gl-renderer.so", -+ "gl_renderer_interface"); -+ if (!gl_renderer) { -+ weston_log("could not load gl renderer\n"); -+ goto out_launcher; -+ } -+ -+ if (gl_renderer->display_create(compositor, NO_EGL_PLATFORM, -+ EGL_DEFAULT_DISPLAY, -+ NULL, -+ gl_renderer->opaque_attribs, -+ NULL, 0) < 0) { -+ weston_log("gl_renderer_create failed.\n"); -+ goto out_launcher; -+ } -+ } - - if (fbdev_output_create(backend, param->device) < 0) - goto out_launcher; -@@ -779,6 +847,7 @@ config_init_to_defaults(struct weston_fbdev_backend_config *config) - * udev, rather than passing a device node in as a parameter. */ - config->tty = 0; /* default to current tty */ - config->device = "/dev/fb0"; /* default frame buffer */ -+ config->use_gl = 0; - } - - WL_EXPORT int -diff --git a/libweston/compositor-fbdev.h b/libweston/compositor-fbdev.h -index 8b7d900e..806712f9 100644 ---- a/libweston/compositor-fbdev.h -+++ b/libweston/compositor-fbdev.h -@@ -43,6 +43,7 @@ struct weston_fbdev_backend_config { - - int tty; - char *device; -+ int use_gl; - - /** Callback used to configure input devices. - * --- -2.11.0 - diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0002-MGS-2352-ccc-Add-GPU-VIV-support-for-weston-2.0.patch b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0002-MGS-2352-ccc-Add-GPU-VIV-support-for-weston-2.0.patch deleted file mode 100644 index 2eca746a9..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0002-MGS-2352-ccc-Add-GPU-VIV-support-for-weston-2.0.patch +++ /dev/null @@ -1,87 +0,0 @@ -From ca6720b1c19f1581112e6ee371dff6d06aeae569 Mon Sep 17 00:00:00 2001 -From: Meng Mingming <mingming.meng@nxp.com> -Date: Mon, 9 Jan 2017 15:04:27 +0800 -Subject: [PATCH 2/5] MGS-2352 [#ccc] Add GPU-VIV support for weston 2.0 - -Add GPU-VIV support for weston 2.0 - -Upstream Status: Inappropriate [i.MX specific] - -Date: Jan 09, 2017 - -* Weston 2.0 -This requires re-enabling the EGL initialization support -in the fbdev-backend. - -Signed-off-by: Meng Mingming <mingming.meng@nxp.com> -Signed-off-by: Georgi Vlaev <georgi.vlaev@konsulko.com> ---- - libweston/compositor-fbdev.c | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c -index 4ca53b67..f87fccac 100644 ---- a/libweston/compositor-fbdev.c -+++ b/libweston/compositor-fbdev.c -@@ -62,6 +62,7 @@ struct fbdev_backend { - int use_pixman; - uint32_t output_transform; - struct wl_listener session_listener; -+ NativeDisplayType display; - }; - - struct fbdev_screeninfo { -@@ -94,6 +95,9 @@ struct fbdev_output { - /* pixman details. */ - pixman_image_t *hw_surface; - uint8_t depth; -+ -+ NativeDisplayType display; -+ NativeWindowType window; - }; - - struct gl_renderer_interface *gl_renderer; -@@ -444,6 +448,10 @@ fbdev_frame_buffer_destroy(struct fbdev_output *output) - strerror(errno)); - - output->fb = NULL; -+ if(output->window) -+ fbDestroyWindow(output->window); -+ if(output->display) -+ fbDestroyDisplay(output->display); - } - - static void fbdev_output_destroy(struct weston_output *base); -@@ -480,8 +488,13 @@ fbdev_output_enable(struct weston_output *base) - goto out_hw_surface; - } else { - setenv("HYBRIS_EGLPLATFORM", "wayland", 1); -+ output->window = fbCreateWindow(backend->display, -1, -1, 0, 0); -+ if (output->window == NULL) { -+ fprintf(stderr, "failed to create window\n"); -+ return 0; -+ } - if (gl_renderer->output_window_create(&output->base, -- (EGLNativeWindowType)NULL, NULL, -+ (EGLNativeWindowType)output->window, NULL, - gl_renderer->opaque_attribs, - NULL, 0) < 0) { - weston_log("gl_renderer_output_create failed.\n"); -@@ -808,8 +821,13 @@ fbdev_backend_create(struct weston_compositor *compositor, - goto out_launcher; - } - -+ backend->display = fbGetDisplay(backend->compositor->wl_display); -+ if (backend->display == NULL) { -+ weston_log("fbGetDisplay failed.\n"); -+ goto out_launcher; -+ } - if (gl_renderer->display_create(compositor, NO_EGL_PLATFORM, -- EGL_DEFAULT_DISPLAY, -+ backend->display, - NULL, - gl_renderer->opaque_attribs, - NULL, 0) < 0) { --- -2.11.0 - diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0006-Link-compositor-to-egl.patch b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0006-Link-compositor-to-egl.patch deleted file mode 100644 index 3cad74fd4..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/0006-Link-compositor-to-egl.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: weston-1.11.1/configure.ac -=================================================================== ---- weston-1.11.1.orig/configure.ac 2016-11-08 17:26:14.266564760 -0600 -+++ weston-1.11.1/configure.ac 2016-11-09 19:38:58.000000000 -0600 -@@ -93,6 +93,7 @@ - PKG_CHECK_MODULES(EGL, [egl glesv2]) - PKG_CHECK_MODULES([EGL_TESTS], [egl glesv2 wayland-client wayland-egl]) - PKG_CHECK_MODULES([GL_RENDERER], [libdrm]) -+ COMPOSITOR_MODULES="$COMPOSITOR_MODULES egl" - fi - - AC_ARG_ENABLE(xkbcommon, diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/fix-ivi-layout-for-IMX6-fbdev.patch b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/fix-ivi-layout-for-IMX6-fbdev.patch deleted file mode 100644 index a0ef210e9..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-2.0.0/fix-ivi-layout-for-IMX6-fbdev.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1b6dc7e5815d3aa02fd1d01b1334c03473e5cf72 Mon Sep 17 00:00:00 2001 -From: Mihail Grigorov <michael.grigorov@konsulko.com> -Date: Wed, 14 Feb 2018 17:12:42 +0200 -Subject: [PATCH] ivi-shell: event_mask must not be cleared after emit - -Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com> ---- - ivi-shell/ivi-layout.c | 18 ++---------------- - 1 file changed, 2 insertions(+), 16 deletions(-) - -diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c -index 64e4ead8..7d13fc88 100644 ---- a/ivi-shell/ivi-layout.c -+++ b/ivi-shell/ivi-layout.c -@@ -917,20 +917,6 @@ commit_transition(struct ivi_layout* layout) - } - - static void --send_surface_prop(struct ivi_layout_surface *ivisurf) --{ -- wl_signal_emit(&ivisurf->property_changed, ivisurf); -- ivisurf->pending.prop.event_mask = 0; --} -- --static void --send_layer_prop(struct ivi_layout_layer *ivilayer) --{ -- wl_signal_emit(&ivilayer->property_changed, ivilayer); -- ivilayer->pending.prop.event_mask = 0; --} -- --static void - send_prop(struct ivi_layout *layout) - { - struct ivi_layout_layer *ivilayer = NULL; -@@ -938,12 +924,12 @@ send_prop(struct ivi_layout *layout) - - wl_list_for_each_reverse(ivilayer, &layout->layer_list, link) { - if (ivilayer->prop.event_mask) -- send_layer_prop(ivilayer); -+ wl_signal_emit(&ivilayer->property_changed, ivilayer); - } - - wl_list_for_each_reverse(ivisurf, &layout->surface_list, link) { - if (ivisurf->prop.event_mask) -- send_surface_prop(ivisurf); -+ wl_signal_emit(&ivisurf->property_changed, ivisurf); - } - } - --- -2.11.0 - diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_2.0.0.bbappend deleted file mode 100644 index 5cc743326..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_2.0.0.bbappend +++ /dev/null @@ -1,39 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/weston-2.0.0:" - -SRC_URI_append_imxgpu3d = " \ - file://0001-libweston-Restore-EGL-support-for-the-fbdev-backend.patch \ - file://0002-MGS-2352-ccc-Add-GPU-VIV-support-for-weston-2.0.patch \ - file://0006-Link-compositor-to-egl.patch \ - file://fix-ivi-layout-for-IMX6-fbdev.patch \ -" - -# The 'egl' configuration of weston requires gles support, and consideration -# must be taken for the different SoC capabilities: -# - For SoCs with 3d support, imx-gpu-viv provides hardware-accelerated -# egl and gles, so weston egl configuration is enabled. -# - For SoCs with VG2D, like i.MX 6SoloLite, imx-gpu-viv provides -# hardware-accelerated egl but does not provide a compatible software -# version of gles, so weston egl configuration is disabled. -# - For SoCs with no GPU, mesa provides software implementations of egl -# and gles, so weston egl configuration is enabled. -PACKAGECONFIG_IMX_TO_APPEND = "" -PACKAGECONFIG_IMX_TO_APPEND_imxgpu3d = "cairo-glesv2" -PACKAGECONFIG_IMX_TO_REMOVE = "" -PACKAGECONFIG_IMX_TO_REMOVE_imxgpu2d = "egl" -PACKAGECONFIG_IMX_TO_REMOVE_imxgpu3d = "" - -PACKAGECONFIG_append = " ${PACKAGECONFIG_IMX_TO_APPEND}" -PACKAGECONFIG_remove = " ${PACKAGECONFIG_IMX_TO_REMOVE}" - -EXTRA_OECONF_IMX_COMMON = " \ - --disable-libunwind \ - --disable-xwayland-test \ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ -" -EXTRA_OECONF_IMX = "" -EXTRA_OECONF_IMX_imxpxp = "${EXTRA_OECONF_IMX_COMMON}" -EXTRA_OECONF_IMX_imxgpu2d = "${EXTRA_OECONF_IMX_COMMON}" - -EXTRA_OECONF_append = " ${EXTRA_OECONF_IMX}" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/cfg80211.cfg b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/cfg80211.cfg new file mode 100644 index 000000000..3550a7bf6 --- /dev/null +++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/cfg80211.cfg @@ -0,0 +1 @@ +CONFIG_CFG80211=y diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend index 3da7180e6..541598237 100644 --- a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend +++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend @@ -16,3 +16,8 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/cgroup.cfg" SRC_URI_append_with-lsm-smack = "\ file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \ " + +# Support for CFG80211 subsystem +SRC_URI_append = " file://cfg80211.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/cfg80211.cfg" + diff --git a/meta-agl-profile-core/files/group b/meta-agl-profile-core/files/group index 77fb6ebc0..ebf19e9a4 100644 --- a/meta-agl-profile-core/files/group +++ b/meta-agl-profile-core/files/group @@ -89,3 +89,4 @@ agl-driver::1001: agl-passenger::1002: systemd-network::1005: systemd-resolve::1006: +mosquitto::1007: diff --git a/meta-agl-profile-core/files/passwd b/meta-agl-profile-core/files/passwd index def1bb791..bd1788f1f 100644 --- a/meta-agl-profile-core/files/passwd +++ b/meta-agl-profile-core/files/passwd @@ -59,3 +59,4 @@ cyrus::955:8::: display::200:200::: systemd-network::1005:1005::: systemd-resolve::1006:1006::: +mosquitto::1007:1007::: diff --git a/meta-agl.md b/meta-agl.md index 59167adfd..19f80ee3e 100755 --- a/meta-agl.md +++ b/meta-agl.md @@ -9,7 +9,7 @@ You use this layer as the minimal core on which to build AGL profiles. [`meta-agl-demo`](./meta-agl-demo.html) layer. Furthermore, `meta-agl` does not include additional components, such as security, which are part of the - [`meta-agl-extra`](./meta-agl-extra.html) layer. + `meta-agl-extra` layer. ## Sub-Layers diff --git a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc index f09144959..779006506 100644 --- a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc +++ b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc @@ -2,6 +2,4 @@ # recognized by meta-freescale/dynamic-layers BBLAYERS =+ "\ ${METADIR}/meta-freescale \ - ${METADIR}/meta-freescale-3rdparty \ - ${METADIR}/meta-freescale-distro \ " diff --git a/templates/machine/imx6qdlsabreauto/50_local.conf.inc b/templates/machine/imx6qdlsabreauto/50_local.conf.inc new file mode 100644 index 000000000..58e3c7d02 --- /dev/null +++ b/templates/machine/imx6qdlsabreauto/50_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "imx6qdlsabreauto" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc +require conf/include/agl_imx6qdlsabreauto.inc + diff --git a/templates/machine/imx6qsabreauto/50_setup.sh b/templates/machine/imx6qdlsabreauto/50_setup.sh index bb22790dc..bb22790dc 100644 --- a/templates/machine/imx6qsabreauto/50_setup.sh +++ b/templates/machine/imx6qdlsabreauto/50_setup.sh diff --git a/templates/machine/imx6qsabreauto/50_local.conf.inc b/templates/machine/imx6qsabreauto/50_local.conf.inc deleted file mode 100644 index cbfda6a86..000000000 --- a/templates/machine/imx6qsabreauto/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "imx6qsabreauto" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc -require conf/include/agl_imx6qsabreauto.inc - diff --git a/templates/machine/imx6qsabrelite/40_bblayers.conf.inc b/templates/machine/imx6qsabrelite/40_bblayers.conf.inc deleted file mode 100644 index 2377ff6bc..000000000 --- a/templates/machine/imx6qsabrelite/40_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -BBLAYERS =+ "\ - ${METADIR}/meta-freescale \ - ${METADIR}/meta-freescale-3rdparty \ - ${METADIR}/meta-freescale-distro \ - ${METADIR}/meta-boundary \ - " diff --git a/templates/machine/imx6qsabrelite/50_local.conf.inc b/templates/machine/imx6qsabrelite/50_local.conf.inc deleted file mode 100644 index 72700ccc7..000000000 --- a/templates/machine/imx6qsabrelite/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "imx6qsabrelite" -require conf/include/agl_imx6qsabrelite.inc diff --git a/templates/machine/imx6qsabrelite/50_setup.sh b/templates/machine/imx6qsabrelite/50_setup.sh deleted file mode 100644 index bb22790dc..000000000 --- a/templates/machine/imx6qsabrelite/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/joule/50_bblayers.conf.inc b/templates/machine/joule/50_bblayers.conf.inc deleted file mode 100644 index d50ccc922..000000000 --- a/templates/machine/joule/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/meta-intel" diff --git a/templates/machine/joule/50_local.conf.inc b/templates/machine/joule/50_local.conf.inc deleted file mode 100644 index 04b7e6f20..000000000 --- a/templates/machine/joule/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "intel-corei7-64" -#see meta-agl/meta-agl-bsp/conf/include/agl_joule.inc -require conf/include/agl_joule.inc diff --git a/templates/machine/nitrogen6x/40_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc deleted file mode 100644 index 2377ff6bc..000000000 --- a/templates/machine/nitrogen6x/40_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -BBLAYERS =+ "\ - ${METADIR}/meta-freescale \ - ${METADIR}/meta-freescale-3rdparty \ - ${METADIR}/meta-freescale-distro \ - ${METADIR}/meta-boundary \ - " diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc deleted file mode 100644 index e0133552d..000000000 --- a/templates/machine/nitrogen6x/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "nitrogen6x" -require conf/include/agl_nitrogen6x.inc - diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh deleted file mode 100644 index bb22790dc..000000000 --- a/templates/machine/nitrogen6x/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/raspberrypi2/50_bblayers.conf.inc b/templates/machine/raspberrypi2/50_bblayers.conf.inc deleted file mode 100644 index 1250b359f..000000000 --- a/templates/machine/raspberrypi2/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/meta-raspberrypi" diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc deleted file mode 100644 index 5d314eeb4..000000000 --- a/templates/machine/raspberrypi2/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "raspberrypi2" -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi2.inc -require conf/include/agl_raspberrypi2.inc |