diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-21 11:57:54 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-21 11:57:54 +0300 |
commit | 460ef0a31e5e5684e785cdde115244e69f74b01b (patch) | |
tree | 6f42855f3e92e16e730fd1bfcbf7fb07369d42f7 /conf | |
parent | 4ae75513231a69dc176fdb37c20bcb8c87c2f8c8 (diff) | |
parent | 2b115238356e2cfa963f004cb8469533d4d21305 (diff) | |
download | meta-boot2qt-460ef0a31e5e5684e785cdde115244e69f74b01b.tar.gz |
Merge remote-tracking branch 'origin/fido' into jethro
* origin/fido:
qt5: update submodules
toradex: use latest u-boot and flashing scripts
kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
Use code.qt.io with git protocol instead of codereview
Use new repo url for utils and appcontroller
qt5: update submodules
qtquickcompiler: update revision
qtquickcompiler: update revision
Fix typo in RPi overlay config
Update meta layers
Conflicts:
conf/distro/include/colibri-imx6.conf
conf/distro/include/raspberrypi2.conf
conf/distro/include/toradex.inc
meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
recipes-qt/b2qt-addons/b2qt-appcontroller.bb
recipes-qt/b2qt-addons/b2qt-utils.bb
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative-render2d_git.bb
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcompiler_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
scripts/manifest.xml
Change-Id: I621a82a6deeeb2b74c8179c2f46b4fa42968b636
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/apalis-imx6.conf | 12 | ||||
-rw-r--r-- | conf/distro/include/colibri-imx6.conf | 6 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 7 | ||||
-rw-r--r-- | conf/distro/include/toradex.inc | 11 |
4 files changed, 18 insertions, 18 deletions
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index fdc211d..1e8e876 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -35,21 +35,21 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6" | |||
35 | 35 | ||
36 | KERNEL_IMAGETYPE = "uImage" | 36 | KERNEL_IMAGETYPE = "uImage" |
37 | 37 | ||
38 | UBOOT_MACHINE = "" | ||
39 | UBOOT_CONFIG ??= "com it" | ||
40 | UBOOT_CONFIG[com] = "apalis_imx6_defconfig" | ||
41 | UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" | ||
42 | |||
38 | BOOTFS_CONTENT = "\ | 43 | BOOTFS_CONTENT = "\ |
39 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 44 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
40 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ | 45 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ |
41 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ | 46 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ |
42 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ | 47 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ |
43 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ | 48 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ |
44 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
45 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
46 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
47 | " | 49 | " |
48 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 50 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
49 | BOOT_SCRIPTS += " \ | 51 | BOOT_SCRIPTS += " \ |
50 | u-boot-${MACHINE}.imx:u-boot.imx \ | 52 | u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ |
51 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
52 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
53 | " | 53 | " |
54 | 54 | ||
55 | SERIAL_CONSOLES = "115200;ttymxc0 \ | 55 | SERIAL_CONSOLES = "115200;ttymxc0 \ |
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 6427ee9..0b4b12c 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf | |||
@@ -39,11 +39,5 @@ BOOTFS_CONTENT = "\ | |||
39 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 39 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
40 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ | 40 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ |
41 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ | 41 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ |
42 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
43 | " | 42 | " |
44 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 43 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
45 | BOOT_SCRIPTS += " \ | ||
46 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
47 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
48 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
49 | " | ||
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index e1c5d55..6b2c5bf 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -37,17 +37,12 @@ IMAGE_FSTYPES += "ext3 sdcard" | |||
37 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" | 37 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" |
38 | 38 | ||
39 | BOOTFS_CONTENT = "\ | 39 | BOOTFS_CONTENT = "\ |
40 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
41 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
42 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
43 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ | 40 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ |
44 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ | 41 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ |
45 | " | 42 | " |
46 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 43 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
47 | BOOT_SCRIPTS += " \ | 44 | BOOT_SCRIPTS += " \ |
48 | u-boot-${MACHINE}.imx:u-boot.imx \ | 45 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
49 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
50 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
51 | " | 46 | " |
52 | 47 | ||
53 | DEFAULTTUNE = "armv7ahf-neon" | 48 | DEFAULTTUNE = "armv7ahf-neon" |
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 9408c73..647362d 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc | |||
@@ -29,3 +29,14 @@ | |||
29 | 29 | ||
30 | BBMASK ?= " " | 30 | BBMASK ?= " " |
31 | BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra" | 31 | BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra" |
32 | |||
33 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" | ||
34 | |||
35 | MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" | ||
36 | BOOT_SCRIPTS += " \ | ||
37 | fwd_blk.img:flash_blk.img \ | ||
38 | fwd_eth.img:flash_eth.img \ | ||
39 | fwd_mmc.img:flash_mmc.img \ | ||
40 | ${MACHINE}:${MACHINEDIR} \ | ||
41 | u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \ | ||
42 | " | ||