Update i.MX machine configurations

Changes:
- Add new i.MX and i.MX6 common inc files and shift duplicated
  configuration to them.
- Switch to using the newer IMX_BSP_DEFAULT variable mechanism for
  selecting mainline vs NXP bits, instead of adding use-mainline-bsp
  to MACHINEOVERRIDES.
- Remove the accidental addition of agl-medium-arm-compiler to
  DISTRO_FEATURES for the imx8mqevk configurations.
- Remove some other stale variable definitions.
- Update BSP layer path in i.MX6 template 50_setup.sh files, these
  were missed on a previous update.

Bug-AGL: SPEC-3933

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I0145e3c8b73b4d53706fda4237ab10f181fd16f7
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26377
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc
index 4646432..c3ba5fc 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_cubox-i.inc
+++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc
@@ -1,24 +1,11 @@
-DISTRO_FEATURES_append = " agl-medium-arm-compiler"
-
-# This disables the Freescale/NXP Vivante GPU driver and enables
-# etnaviv support.
-MACHINEOVERRIDES .= ":use-mainline-bsp"
-
-# Disable meta-freescale package architecure mangling, as it causes
-# issues with AGL's explicit setting of DEFAULTTUNE.
-INHERIT_remove = "fsl-dynamic-packagearch"
-MACHINE_SOCARCH = "${TUNE_PKGARCH}"
+require agl_imx6-common.inc
 
 # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware
 KERNEL_DEVICETREE_append = " \
-       imx6dl-hummingboard-som-v15.dtb imx6q-hummingboard-som-v15.dtb \ 
-       imx6dl-hummingboard2.dtb imx6q-hummingboard2.dtb \
-       imx6dl-hummingboard2-som-v15.dtb imx6q-hummingboard2-som-v15.dtb \
+       imx6dl-hummingboard-som-v15.dtb \
+       imx6q-hummingboard-som-v15.dtb \
+       imx6dl-hummingboard2.dtb \
+       imx6q-hummingboard2.dtb \
+       imx6dl-hummingboard2-som-v15.dtb \
+       imx6q-hummingboard2-som-v15.dtb \
 "
-
-# Disable the meta-freescale weston-init bbappend as it conflicts
-# with AGL's.
-BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
-
-# Set CMA size large enough to work with AGL
-UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"

diff --git a/meta-agl-bsp/conf/include/agl_imx-common.inc b/meta-agl-bsp/conf/include/agl_imx-common.inc
new file mode 100644 (file)
index 0000000..f6cc567
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_imx-common.inc
@@ -0,0 +1,8 @@
+# Disable meta-freescale package architecure mangling, as it causes
+# issues with AGL's explicit setting of DEFAULTTUNE.
+INHERIT_remove = "fsl-dynamic-packagearch"
+MACHINE_SOCARCH = "${TUNE_PKGARCH}"
+
+# Disable the meta-freescale weston-init bbappend as it conflicts
+# with AGL's.
+BBMASK += "meta-freescale/recipes-graphics/wayland/weston-init"

diff --git a/meta-agl-bsp/conf/include/agl_imx6-common.inc b/meta-agl-bsp/conf/include/agl_imx6-common.inc
new file mode 100644 (file)
index 0000000..1ba2bce
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_imx6-common.inc
@@ -0,0 +1,14 @@
+require agl_imx-common.inc
+
+DISTRO_FEATURES_append = " agl-medium-arm-compiler"
+
+# This disables the Freescale/NXP Vivante GPU driver and enables
+# etnaviv support.  This is the default for the i.MX6 platforms in
+# meta-freescale, but not for all the ones in meta-freescale-3rdparty,
+# so set it here to give a consistent default.
+IMX_DEFAULT_BSP = "mainline"
+
+# Set CMA size large enough to work with AGL
+UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
+
+AGL_DEFAULT_INITRAMFS_FSTYPES := ""

diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
index 0d8c6f2..cb13de7 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
+++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
@@ -1,19 +1 @@
-DISTRO_FEATURES_append = " agl-medium-arm-compiler"
-
-# This disables the Freescale/NXP Vivante GPU driver and enables
-# etnaviv support.
-MACHINEOVERRIDES .= ":use-mainline-bsp"
-
-# Disable meta-freescale package architecure mangling, as it causes
-# issues with AGL's explicit setting of DEFAULTTUNE.
-INHERIT_remove = "fsl-dynamic-packagearch"
-MACHINE_SOCARCH = "${TUNE_PKGARCH}"
-
-# Disable the meta-freescale weston-init bbappend as it conflicts
-# with AGL's.
-BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
-
-# Set CMA size large enough to work with AGL
-UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
-
-AGL_DEFAULT_INITRAMFS_FSTYPES := ""
+require agl_imx6-common.inc

diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc
index bc0f768..3640ec2 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc
+++ b/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc
@@ -1,4 +1,4 @@
-DISTRO_FEATURES_append = " agl-medium-arm-compiler"
+require agl_imx-common.inc
 
 # Force use of the community supported LTS kernel instead of the
 # default linux-imx
@@ -10,13 +10,4 @@ MACHINE_FEATURES_append = " bcm4356"
 # Add helper to drive setting up HCI UART device
 MACHINE_EXTRA_RRECOMMENDS_append = " hci-uart-helper"
 
-# Disable meta-freescale package architecure mangling, as it causes
-# issues with AGL's explicit setting of DEFAULTTUNE.
-INHERIT_remove = "fsl-dynamic-packagearch"
-MACHINE_SOCARCH = "${TUNE_PKGARCH}"
-
-# Disable the meta-freescale weston-init bbappend as it conflicts
-# with AGL's.
-BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
-
 AGL_DEFAULT_INITRAMFS_FSTYPES := ""

diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index 77eb973..cb13de7 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -1,20 +1 @@
-DISTRO_FEATURES_append = " agl-medium-arm-compiler"
-
-# This disables the Freescale/NXP Vivante GPU driver and enables
-# etnaviv support.
-MACHINEOVERRIDES .= ":use-mainline-bsp"
-
-# Disable meta-freescale package architecure mangling, as it causes
-# issues with AGL's explicit setting of DEFAULTTUNE.
-INHERIT_remove = "fsl-dynamic-packagearch"
-MACHINE_SOCARCH = "${TUNE_PKGARCH}"
-
-# Disable the meta-freescale weston-init bbappend as it conflicts
-# with AGL's.
-BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
-
-# Set CMA size large enough to work with AGL
-UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
-
-#WKS_FILE = "imx-uboot.wks"
-AGL_DEFAULT_INITRAMFS_FSTYPES := ""
+require agl_imx6-common.inc

diff --git a/templates/machine/cubox-i/50_setup.sh b/templates/machine/cubox-i/50_setup.sh
index bb22790..eefd1eb 100644 (file)
--- a/templates/machine/cubox-i/50_setup.sh
+++ b/templates/machine/cubox-i/50_setup.sh
@@ -1,2 +1,2 @@
-find_and_ack_eula $METADIR/meta-freescale EULA
+find_and_ack_eula $METADIR/bsp/meta-freescale EULA
 export EULA_FLAG_NAME="ACCEPT_FSL_EULA"

diff --git a/templates/machine/imx6qdlsabreauto/50_setup.sh b/templates/machine/imx6qdlsabreauto/50_setup.sh
index bb22790..eefd1eb 100644 (file)
--- a/templates/machine/imx6qdlsabreauto/50_setup.sh
+++ b/templates/machine/imx6qdlsabreauto/50_setup.sh
@@ -1,2 +1,2 @@
-find_and_ack_eula $METADIR/meta-freescale EULA
+find_and_ack_eula $METADIR/bsp/meta-freescale EULA
 export EULA_FLAG_NAME="ACCEPT_FSL_EULA"

diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh
index bb22790..eefd1eb 100644 (file)
--- a/templates/machine/nitrogen6x/50_setup.sh
+++ b/templates/machine/nitrogen6x/50_setup.sh
@@ -1,2 +1,2 @@
-find_and_ack_eula $METADIR/meta-freescale EULA
+find_and_ack_eula $METADIR/bsp/meta-freescale EULA
 export EULA_FLAG_NAME="ACCEPT_FSL_EULA"