6 files changed, 20 insertions, 157 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)} \
-    "