aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-06-22 09:41:14 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-06-22 16:40:10 +0300
commit2f8ef2cf9fdb98c78634c445758a199a6c4bc21f (patch)
treec99d14bd356b5f1f0d09f60b201c315774987ae1
parent3a6b9feb47230375258e5772c6509a6018e2a017 (diff)
colibri-imx8x: fix broken build
Latest meta-freescale (zeus) layer update included some default tuning updates that were incompatible with zeus branch. Other tuning commit was reverted there but commit "1fbb03a5d024116e5b6e2ec9c6b259d3aaf02a3d mx8qxp: Use cortexa35-crypto tuning for i.MX 8 QXP default" got left and broke colibri-imx8x build with message: "Tuning 'cortexa35-crypto' has no defined features, and cannot be used." Change-Id: I5850c01a8625d60d9c7058b52a3cf1228719023d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt-distro/conf/distro/include/fsl.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index f5642fd7..ecc3a9a0 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -38,6 +38,9 @@ QBSP_IMAGE_CONTENT ?= "\
${IMAGE_LINK_NAME}.conf \
"
+# meta-freescale sets mx8qxp to cortexa35-crypto unavailable in zeus
+DEFAULTTUNE_mx8qxp = "aarch64"
+
# Use gstreamer 1.14 from meta-freescale
PREFERRED_VERSION_gstreamer1.0 ?= "1.14.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.14.imx"