aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihail Grigorov <michael.grigorov@konsulko.com>2017-10-26 17:23:40 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-10-31 15:44:05 +0000
commit08a721eea2cb480e6879a7de15dea68e5a236570 (patch)
tree1107f5dd8e99e5d71a539075c6e5f54524de3954
parent0f54abc7c532cc14974b72512f01e51fbeea1b1e (diff)
meta-agl-bsp: templates: update of nitrogen6x machine template
Bug-AGL: SPEC-905 Change-Id: I959a9f8d085b0fb247998790191c3dcf2e4e34fa Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11567 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Reviewed-by: Matt Porter <mporter@konsulko.com>
-rw-r--r--meta-agl-bsp/conf/include/agl_nitrogen6x.inc5
-rw-r--r--templates/machine/nitrogen6x/40_bblayers.conf.inc (renamed from templates/machine/nitrogen6x/50_bblayers.conf.inc)0
2 files changed, 5 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index 4fb05725c..9f2345330 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -3,3 +3,8 @@ 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/templates/machine/nitrogen6x/50_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc
index 2377ff6bc..2377ff6bc 100644
--- a/templates/machine/nitrogen6x/50_bblayers.conf.inc
+++ b/templates/machine/nitrogen6x/40_bblayers.conf.inc