From 2a3c99e33ae1bab1f772153f78e5b274d9f38e90 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 28 Oct 2014 10:08:04 -0200 Subject: [PATCH] imx-base.inc: Use specific package feed for MX6QDL and MX6SL The sharing of packaging feed between MX6QDL and MX6SL is very fragile. In rare cases, when a package is not generated for the machine it can fallback to the wrong set of packages. This has been seen on the Vivante GPU packages as MX6SL does not include libegles2-mx6 and the packaging system ended using the one provided by MX6QDL SoC. This issue was very hard to find out the cause and understand why it was happening so I'd like to thank Richard Purdie for his help in figuring it out. Signed-off-by: Richard Purdie Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/machine/include/imx-base.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index a05576f5..cd84c181 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/conf/machine/include/imx-base.inc @@ -42,16 +42,16 @@ DEFAULTTUNE_mx6 ?= "cortexa9hf-neon" MACHINE_SOCARCH ?= "" MACHINE_SOCARCH_mx3 = "${TUNE_PKGARCH}-mx3" MACHINE_SOCARCH_mx5 = "${TUNE_PKGARCH}-mx5" -MACHINE_SOCARCH_mx6 = "${TUNE_PKGARCH}-mx6" +MACHINE_SOCARCH_mx6q = "${TUNE_PKGARCH}-mx6qdl" +MACHINE_SOCARCH_mx6dl = "${TUNE_PKGARCH}-mx6qdl" +MACHINE_SOCARCH_mx6sl = "${TUNE_PKGARCH}-mx6sl" MACHINE_SOCARCH_vf60 = "${TUNE_PKGARCH}-vf60" PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_ARCH_FILTER_append_mx6sl = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins" MACHINE_SOCARCH_FILTER_append_mx5 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" -MACHINE_SOCARCH_FILTER_append_mx6q = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" -MACHINE_SOCARCH_FILTER_append_mx6dl = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" +MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" INHERIT += "fsl-dynamic-packagearch" -- 2.40.1