diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-07 08:49:47 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-07 08:49:47 +0200 |
commit | 85e2dbf78e6ba044fea744367f16ccd1808c1810 (patch) | |
tree | 87b31ac6c770274cf7e219c312b32d9d25af8b40 /conf | |
parent | 3587c4fb32e5046729608513bf4c189e846fefd4 (diff) | |
parent | c97f13c28d29bd71c98043f709a5875606300142 (diff) | |
download | meta-boot2qt-85e2dbf78e6ba044fea744367f16ccd1808c1810.tar.gz |
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
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 11 |
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 = "\ | |||
34 | 6x_bootscript-${MACHINE}:6x_bootscript \ | 34 | 6x_bootscript-${MACHINE}:6x_bootscript \ |
35 | 6x_upgrade-${MACHINE}:6x_upgrade \ | 35 | 6x_upgrade-${MACHINE}:6x_upgrade \ |
36 | u-boot-${MACHINE}.imx:u-boot.imx \ | 36 | u-boot-${MACHINE}.imx:u-boot.imx \ |
37 | ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \ | ||
38 | ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \ | ||
39 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ | ||
40 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \ | ||
42 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \ | ||
43 | update/platform:update/platform \ | ||
44 | " | 37 | " |
45 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy" | 38 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy" |
46 | 39 | ||
47 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" | 40 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" |
48 | 41 | ||
@@ -71,6 +64,4 @@ MACHINE_EXTRA_INSTALL_SDK += " \ | |||
71 | opencv-dev \ | 64 | opencv-dev \ |
72 | " | 65 | " |
73 | 66 | ||
74 | B2QT_PLATFORM = "iMX6-eLinux" | ||
75 | |||
76 | ADB_PRODUCTID = "0x0d02" | 67 | ADB_PRODUCTID = "0x0d02" |