From 9b9527cdff041c30b816338d21b16e327204bc61 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 8 Dec 2017 11:39:33 +0200 Subject: poky, meta-openembedded, fsl, linaro: update pyro branches * poky updated to 2.3.3. * meta-openembedded updated up the pyro branch to the most recent working commit (before opencv split). FSL & linaro layers updated at the same time as poky update requires almost latest meta-freescale & meta-linaro (due change in image.bbclass). * nitrogen6x.conf updated due these changes Task-number: QTBUG-65164 Change-Id: I0adb011e774e982b26b7cf0621c1059f0574f76f Reviewed-by: Samuli Piippo --- conf/distro/include/nitrogen6x.conf | 2 ++ scripts/manifest.xml | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index c1cf138..894d51d 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -51,6 +51,8 @@ BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \ u-boot-nitrogen6_vm-*.imx:u-boot.nitrogen6_vm \ " +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary" + UBOOT_MACHINE = "" UBOOT_CONFIG ??= "nit6xlite nit6xlite1g \ nitrogen6dl nitrogen6dl2g \ diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 249dd93..a571ec8 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -17,11 +17,11 @@