Merge remote-tracking branch 'origin/dizzy' into dev

* origin/dizzy:
  Use openembedded mirror from github
  nitrogen6x: add u-boot binary back to the image
  ostree: Add TLS support
  ostree: patch upstream project
  ostree: Add GNUPG to runtime dependencies.
  Revert "Build nativesdk-ostree"
  Remove unused b2qt-update-framework

Conflicts:
	conf/distro/include/nitrogen6x.conf
	recipes/ostree/ostree.bb
	scripts/manifest.xml
	scripts/manifest_fido.xml

Change-Id: Ie3884fa026fc8b8d7d05a9bff4b2beb124e4fd03

1 files changed, 1 insertions, 10 deletions

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 1000676..ce64083 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -34,15 +34,8 @@ BOOTFS_CONTENT = "\
     6x_bootscript-${MACHINE}:6x_bootscript \
     6x_upgrade-${MACHINE}:6x_upgrade \
     u-boot-${MACHINE}.imx:u-boot.imx \
-    ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \
-    update/platform:update/platform \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy"
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
 
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
@@ -71,6 +64,4 @@ MACHINE_EXTRA_INSTALL_SDK += " \
         opencv-dev \
         "
 
-B2QT_PLATFORM = "iMX6-eLinux"
-
 ADB_PRODUCTID = "0x0d02"