From 48cc1b37dc363f4c59630d2307fd0d4f5d93780d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 30 May 2021 14:58:49 -0400 Subject: 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 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 --- meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc') diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc index 0d8c6f239..cb13de713 100644 --- 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 -- cgit 1.2.3-korg