diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-22 15:02:09 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-22 15:56:17 +0300 |
commit | 650460f8f125d18ae03c0622e3dd93630efb0fc7 (patch) | |
tree | cccae5089a35efb860e9bbe0ae9c20be114bf35a | |
parent | f668dddf1f95318b14737c6eb17dabbca213ca22 (diff) | |
parent | 2b9e77c40609da75fa44e3376341f484e0ab0288 (diff) | |
download | meta-boot2qt-650460f8f125d18ae03c0622e3dd93630efb0fc7.tar.gz |
Merge remote-tracking branch 'origin/jethro' into merge
* origin/jethro:
Rename last references to b2qt-utils
Rename b2qt-utils to qtdeviceutilities
toradex: apply u-boot and flashing script changes to colibri-imx7
nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
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
kontron: patch kernel to support newer vivante drivers
Fetch only external repos for repo mirror
qt5: update submodules
Add rsync to image
Fix raspberry3 build error in perl deployment
rcar-gen2: USB fixups
ostree: Added dependency for systemd
qtquickcompiler: update revision
qtquickcompiler: update revision
Fix typo in RPi overlay config
Update meta layers
Conflicts:
conf/distro/include/toradex.inc
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
recipes/ostree/ostree.bb
recipes/samba/samba_4.1.12.bbappend
scripts/manifest_jethro.xml
Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848
49 files changed, 769 insertions, 197 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 56aeb1a..08abc2a 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -162,7 +162,7 @@ mirror() { | |||
162 | mkdir -p .repo/manifests | 162 | mkdir -p .repo/manifests |
163 | cp ${DIR}/scripts/manifest.xml .repo/manifests/ | 163 | cp ${DIR}/scripts/manifest.xml .repo/manifests/ |
164 | MANIFEST="manifest.xml" | 164 | MANIFEST="manifest.xml" |
165 | ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror | 165 | ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g external --mirror |
166 | ${REPO} sync | 166 | ${REPO} sync |
167 | } | 167 | } |
168 | 168 | ||
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 58bcdba..7a2666b 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -34,21 +34,21 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6" | |||
34 | 34 | ||
35 | KERNEL_IMAGETYPE = "uImage" | 35 | KERNEL_IMAGETYPE = "uImage" |
36 | 36 | ||
37 | UBOOT_MACHINE = "" | ||
38 | UBOOT_CONFIG ??= "com it" | ||
39 | UBOOT_CONFIG[com] = "apalis_imx6_defconfig" | ||
40 | UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" | ||
41 | |||
37 | BOOTFS_CONTENT = "\ | 42 | BOOTFS_CONTENT = "\ |
38 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 43 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
39 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ | 44 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ |
40 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ | 45 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ |
41 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ | 46 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ |
42 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ | 47 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ |
43 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
44 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
45 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
46 | " | 48 | " |
47 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 49 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
48 | BOOT_SCRIPTS += " \ | 50 | BOOT_SCRIPTS += " \ |
49 | u-boot-${MACHINE}.imx:u-boot.imx \ | 51 | u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ |
50 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
51 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
52 | " | 52 | " |
53 | 53 | ||
54 | SERIAL_CONSOLES = "115200;ttymxc0 \ | 54 | SERIAL_CONSOLES = "115200;ttymxc0 \ |
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index eabaf91..8a9bda5 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf | |||
@@ -38,11 +38,5 @@ BOOTFS_CONTENT = "\ | |||
38 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 38 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
39 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ | 39 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ |
40 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ | 40 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ |
41 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
42 | " | 41 | " |
43 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 42 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
44 | BOOT_SCRIPTS += " \ | ||
45 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
46 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
47 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
48 | " | ||
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 193e6aa..149894f 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
@@ -28,13 +28,7 @@ BOOTFS_CONTENT = "\ | |||
28 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 28 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
29 | ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \ | 29 | ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \ |
30 | ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ | 30 | ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ |
31 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
32 | " | 31 | " |
33 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 32 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
34 | BOOT_SCRIPTS += " \ | ||
35 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
36 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
37 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
38 | " | ||
39 | 33 | ||
40 | DISTRO_FEATURES_remove = "webengine" | 34 | DISTRO_FEATURES_remove = "webengine" |
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index e4fdd93..845e2ff 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -33,17 +33,12 @@ IMAGE_FSTYPES += "ext3 sdcard" | |||
33 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" | 33 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" |
34 | 34 | ||
35 | BOOTFS_CONTENT = "\ | 35 | BOOTFS_CONTENT = "\ |
36 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
37 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
38 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
39 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ | 36 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ |
40 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ | 37 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ |
41 | " | 38 | " |
42 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 39 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
43 | BOOT_SCRIPTS += " \ | 40 | BOOT_SCRIPTS += " \ |
44 | u-boot-${MACHINE}.imx:u-boot.imx \ | 41 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
45 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
46 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
47 | " | 42 | " |
48 | 43 | ||
49 | DEFAULTTUNE = "armv7ahf-neon" | 44 | DEFAULTTUNE = "armv7ahf-neon" |
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 7986cb7..511deab 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -91,7 +91,11 @@ UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config" | |||
91 | 91 | ||
92 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" | 92 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" |
93 | 93 | ||
94 | KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb" | 94 | KERNEL_DEVICETREE += "\ |
95 | imx6dl-nit6xlite.dtb \ | ||
96 | imx6qp-nitrogen6_max.dtb \ | ||
97 | imx6q-nitrogen6_som2.dtb \ | ||
98 | " | ||
95 | 99 | ||
96 | DISTRO_FEATURES_DEFAULT += "wayland" | 100 | DISTRO_FEATURES_DEFAULT += "wayland" |
97 | 101 | ||
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc index c9bf0ae..806c591 100644 --- a/conf/distro/include/rcar-gen2.inc +++ b/conf/distro/include/rcar-gen2.inc | |||
@@ -58,6 +58,12 @@ | |||
58 | # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI | 58 | # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI |
59 | FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:" | 59 | FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:" |
60 | 60 | ||
61 | KERNEL_MODULE_AUTOLOAD += " \ | ||
62 | phy-rcar-gen2-usb \ | ||
63 | hid_multitouch \ | ||
64 | renesas_usbhs \ | ||
65 | " | ||
66 | |||
61 | GLES_DRIVER = "sgx" | 67 | GLES_DRIVER = "sgx" |
62 | GLES_DRIVER_r8a7790 = "rgx" | 68 | GLES_DRIVER_r8a7790 = "rgx" |
63 | 69 | ||
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc new file mode 100644 index 0000000..f448fbe --- /dev/null +++ b/conf/distro/include/toradex.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" | ||
31 | |||
32 | MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" | ||
33 | BOOT_SCRIPTS += " \ | ||
34 | fwd_blk.img:flash_blk.img \ | ||
35 | fwd_eth.img:flash_eth.img \ | ||
36 | fwd_mmc.img:flash_mmc.img \ | ||
37 | ${MACHINE}:${MACHINEDIR} \ | ||
38 | u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \ | ||
39 | " | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb index bb209ad..b5d96b6 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb | |||
@@ -31,11 +31,15 @@ LICENSE = "The-Qt-Company-DCLA-2.1" | |||
31 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | 31 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" |
32 | DEPENDS = "u-boot-mkimage-native" | 32 | DEPENDS = "u-boot-mkimage-native" |
33 | 33 | ||
34 | PV = "v2.3" | 34 | PV = "v2.6" |
35 | 35 | ||
36 | SRC_URI = " \ | 36 | SRC_URI = " \ |
37 | file://flash_mmc.scr \ | 37 | file://fwd_mmc.scr \ |
38 | file://fwd_blk.scr \ | ||
39 | file://fwd_eth.scr \ | ||
38 | file://flash_blk.scr \ | 40 | file://flash_blk.scr \ |
41 | file://flash_eth.scr \ | ||
42 | file://0001-Update-only-u-boot.patch \ | ||
39 | " | 43 | " |
40 | 44 | ||
41 | S = "${WORKDIR}" | 45 | S = "${WORKDIR}" |
@@ -43,27 +47,20 @@ S = "${WORKDIR}" | |||
43 | inherit deploy | 47 | inherit deploy |
44 | 48 | ||
45 | do_mkimage () { | 49 | do_mkimage () { |
46 | uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ | 50 | for scr in ${WORKDIR}/*.scr; do |
47 | -n "update script" -d ${WORKDIR}/flash_mmc.scr \ | 51 | uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ |
48 | flash_mmc.img | 52 | -n "update script" -d ${scr} \ |
49 | 53 | $(basename ${scr} .scr).img | |
50 | uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ | 54 | done |
51 | -n "update script" -d ${WORKDIR}/flash_blk.scr \ | ||
52 | flash_blk.img | ||
53 | } | 55 | } |
54 | 56 | ||
55 | addtask mkimage after do_compile before do_install | 57 | addtask mkimage after do_compile before do_install |
56 | 58 | ||
57 | do_deploy () { | 59 | do_deploy () { |
58 | install -d ${DEPLOYDIR} | 60 | install -d ${DEPLOYDIR}/${MACHINE} |
59 | install ${S}/flash_mmc.img ${DEPLOYDIR}/flash_mmc-${MACHINE}-${PV}-${PR}.img | 61 | install -m 0644 -t ${DEPLOYDIR} ${S}/*.img |
60 | install ${S}/flash_blk.img ${DEPLOYDIR}/flash_blk-${MACHINE}-${PV}-${PR}.img | 62 | ln -s ../flash_blk.img ${DEPLOYDIR}/${MACHINE}/ |
61 | 63 | ln -s ../flash_eth.img ${DEPLOYDIR}/${MACHINE}/ | |
62 | cd ${DEPLOYDIR} | ||
63 | rm -f flash_mmc-${MACHINE}.img | ||
64 | ln -sf flash_mmc-${MACHINE}-${PV}-${PR}.img flash_mmc-${MACHINE}.img | ||
65 | rm -f flash_blk-${MACHINE}.img | ||
66 | ln -sf flash_blk-${MACHINE}-${PV}-${PR}.img flash_blk-${MACHINE}.img | ||
67 | } | 64 | } |
68 | 65 | ||
69 | addtask deploy after do_install before do_build | 66 | addtask deploy after do_install before do_build |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..5c62eb1 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 262b1dcc5f886ceb1944c8db3c1072c98d45a56e Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 10:11:32 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 8 ++++---- | ||
8 | flash_eth.scr | 8 ++++---- | ||
9 | 2 files changed, 8 insertions(+), 8 deletions(-) | ||
10 | |||
11 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
12 | index 800383c..398c4de 100644 | ||
13 | --- a/flash_blk.scr | ||
14 | +++ b/flash_blk.scr | ||
15 | @@ -30,16 +30,16 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa | ||
16 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
17 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
18 | |||
19 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
20 | -setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
21 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
22 | +setenv echo_migrate-it echo "successfully updated U-Boot" | ||
23 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
24 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
25 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
26 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
27 | |||
28 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
29 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
30 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
31 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
32 | setenv update_it 'setenv module_type -it; run update' | ||
33 | |||
34 | -echo 'enter "run update" or "run update_it" to update the entire module' | ||
35 | +echo 'enter "run update" or "run update_it" to update the uboot' | ||
36 | diff --git a/flash_eth.scr b/flash_eth.scr | ||
37 | index 804c924..2f64288 100644 | ||
38 | --- a/flash_eth.scr | ||
39 | +++ b/flash_eth.scr | ||
40 | @@ -31,16 +31,16 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt | ||
41 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
42 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
43 | |||
44 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
45 | -setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
46 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
47 | +setenv echo_migrate-it echo "successfully updated U-Boot" | ||
48 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
49 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
50 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
51 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
52 | |||
53 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
54 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
55 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
56 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
57 | setenv update_it 'setenv module_type -it; run update' | ||
58 | |||
59 | -echo 'enter "run update" or "run update_it" to update the entire module' | ||
60 | +echo 'enter "run update" or "run update_it" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr new file mode 100644 index 0000000..398c4de --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr | |||
@@ -0,0 +1,45 @@ | |||
1 | test -n ${interface} || setenv interface mmc | ||
2 | test -n ${drive} || setenv drive 1 | ||
3 | |||
4 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
5 | setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
6 | |||
7 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
8 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
9 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
10 | setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' | ||
11 | |||
12 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
13 | |||
14 | setenv migrate_uboot_old 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' | ||
15 | setenv migrate_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | ||
16 | |||
17 | setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | ||
18 | |||
19 | setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
20 | setenv update_uboot_it 'setenv module_type -it; run update_uboot' | ||
21 | |||
22 | setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | ||
23 | |||
24 | setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | ||
25 | |||
26 | setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
27 | |||
28 | setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | ||
29 | setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | ||
30 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
31 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
32 | |||
33 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
34 | setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
35 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
36 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
37 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
38 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
39 | |||
40 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
41 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
42 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
43 | setenv update_it 'setenv module_type -it; run update' | ||
44 | |||
45 | echo 'enter "run update" or "run update_it" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr new file mode 100644 index 0000000..2f64288 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr | |||
@@ -0,0 +1,46 @@ | |||
1 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
2 | #workaround U-Boot counting in hex and split did in decimal | ||
3 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | ||
4 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
5 | |||
6 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
7 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
8 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
9 | setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' | ||
10 | |||
11 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
12 | |||
13 | setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' | ||
14 | setenv migrate_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | ||
15 | |||
16 | setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | ||
17 | |||
18 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
19 | setenv update_uboot_it 'setenv module_type -it; run update_uboot' | ||
20 | |||
21 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | ||
22 | |||
23 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | ||
24 | |||
25 | setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
26 | |||
27 | setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | ||
28 | setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | ||
29 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
30 | #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows | ||
31 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
32 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
33 | |||
34 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
35 | setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
36 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
37 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
38 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
39 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
40 | |||
41 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
42 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
43 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
44 | setenv update_it 'setenv module_type -it; run update' | ||
45 | |||
46 | echo 'enter "run update" or "run update_it" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..cf01d59 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 40445299edb425159c30609e1ab7172801535a43 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 10:17:02 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 6 +++--- | ||
8 | flash_eth.scr | 6 +++--- | ||
9 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
12 | index a60a7a5..23c5b72 100644 | ||
13 | --- a/flash_blk.scr | ||
14 | +++ b/flash_blk.scr | ||
15 | @@ -29,13 +29,13 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa | ||
16 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
17 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
18 | |||
19 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
20 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
21 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
22 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | ||
23 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | ||
24 | |||
25 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
26 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
27 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
28 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
29 | |||
30 | -echo 'enter "run update" to update the entire module' | ||
31 | +echo 'enter "run update" to update the uboot' | ||
32 | diff --git a/flash_eth.scr b/flash_eth.scr | ||
33 | index a3906b2..14f4104 100644 | ||
34 | --- a/flash_eth.scr | ||
35 | +++ b/flash_eth.scr | ||
36 | @@ -30,13 +30,13 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt | ||
37 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
38 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
39 | |||
40 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
41 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
42 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
43 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | ||
44 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | ||
45 | |||
46 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
47 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
48 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
49 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
50 | |||
51 | -echo 'enter "run update" to update the entire module' | ||
52 | +echo 'enter "run update" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr new file mode 100644 index 0000000..23c5b72 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr | |||
@@ -0,0 +1,41 @@ | |||
1 | test -n ${interface} || setenv interface mmc | ||
2 | test -n ${drive} || setenv drive 1 | ||
3 | |||
4 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
5 | setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
6 | |||
7 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
8 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
9 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
10 | setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' | ||
11 | |||
12 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
13 | |||
14 | setenv migrate_uboot_old 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' | ||
15 | setenv migrate_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | ||
16 | |||
17 | setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | ||
18 | |||
19 | setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
20 | |||
21 | setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | ||
22 | |||
23 | setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | ||
24 | |||
25 | setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
26 | |||
27 | setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | ||
28 | setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | ||
29 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
30 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
31 | |||
32 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
33 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
34 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | ||
35 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | ||
36 | |||
37 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
38 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
39 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
40 | |||
41 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr new file mode 100644 index 0000000..14f4104 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr | |||
@@ -0,0 +1,42 @@ | |||
1 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
2 | #workaround U-Boot counting in hex and split did in decimal | ||
3 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | ||
4 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
5 | |||
6 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
7 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
8 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
9 | setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' | ||
10 | |||
11 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
12 | |||
13 | setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' | ||
14 | setenv migrate_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | ||
15 | |||
16 | setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | ||
17 | |||
18 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
19 | |||
20 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | ||
21 | |||
22 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | ||
23 | |||
24 | setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
25 | |||
26 | setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | ||
27 | setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | ||
28 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
29 | #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows | ||
30 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
31 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
32 | |||
33 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
34 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
35 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | ||
36 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | ||
37 | |||
38 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
39 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
40 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
41 | |||
42 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..08ddd88 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 10:19:28 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 4 ++-- | ||
8 | flash_eth.scr | 4 ++-- | ||
9 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
12 | index cc4cf38..b63366a 100644 | ||
13 | --- a/flash_blk.scr | ||
14 | +++ b/flash_blk.scr | ||
15 | @@ -14,6 +14,6 @@ setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.i | ||
16 | |||
17 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | ||
18 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | ||
19 | -setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
20 | +setenv update 'mtdparts default && run update_uboot && reset' | ||
21 | |||
22 | -echo 'enter "run update" to update the entire module' | ||
23 | +echo 'enter "run update" to update the uboot' | ||
24 | diff --git a/flash_eth.scr b/flash_eth.scr | ||
25 | index 01be124..13025de 100644 | ||
26 | --- a/flash_eth.scr | ||
27 | +++ b/flash_eth.scr | ||
28 | @@ -14,6 +14,6 @@ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write | ||
29 | |||
30 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | ||
31 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | ||
32 | -setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
33 | +setenv update 'mtdparts default && run update_uboot && reset' | ||
34 | |||
35 | -echo 'enter "run update" to update the entire module' | ||
36 | +echo 'enter "run update" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr new file mode 100644 index 0000000..b63366a --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr | |||
@@ -0,0 +1,19 @@ | |||
1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' | ||
2 | setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' | ||
3 | |||
4 | # Migrate to UBI volume based boot schema | ||
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | ||
6 | setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' | ||
7 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | ||
8 | setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi' | ||
9 | |||
10 | setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' | ||
11 | setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | ||
12 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | ||
13 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
14 | |||
15 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | ||
16 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | ||
17 | setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
18 | |||
19 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr new file mode 100644 index 0000000..13025de --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr | |||
@@ -0,0 +1,19 @@ | |||
1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' | ||
2 | setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' | ||
3 | |||
4 | # Migrate to UBI volume based boot schema | ||
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | ||
6 | setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' | ||
7 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | ||
8 | setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi' | ||
9 | |||
10 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' | ||
11 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | ||
12 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | ||
13 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
14 | |||
15 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | ||
16 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | ||
17 | setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
18 | |||
19 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..f096c2e --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 2b11117dcc616843a6dce1a5e97fcecefa7e3f4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 10:22:27 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 6 +++--- | ||
8 | flash_eth.scr | 6 +++--- | ||
9 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
12 | index 401c47a..8fa5af9 100644 | ||
13 | --- a/flash_blk.scr | ||
14 | +++ b/flash_blk.scr | ||
15 | @@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage | ||
16 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | ||
17 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
18 | |||
19 | -setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | ||
20 | +setenv update_new 'run update_uboot; reset' | ||
21 | |||
22 | # Upgrade part 1, write new U-Boot, but with old ECC format still... | ||
23 | # Store config block temporarly in memory at kernel_addr_r. | ||
24 | @@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 | ||
25 | setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' | ||
26 | |||
27 | # Upgrade part 2, use new ECC format for the whole device... | ||
28 | -setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' | ||
29 | +setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}' | ||
30 | setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' | ||
31 | |||
32 | # fsl_nfc indicates old NAND format (24-bit ECC), start migration process | ||
33 | setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' | ||
34 | |||
35 | -echo 'enter "run update" to update the entire module' | ||
36 | +echo 'enter "run update" to update the uboot' | ||
37 | diff --git a/flash_eth.scr b/flash_eth.scr | ||
38 | index 15aab1c..aa98b3a 100644 | ||
39 | --- a/flash_eth.scr | ||
40 | +++ b/flash_eth.scr | ||
41 | @@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${l | ||
42 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | ||
43 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
44 | |||
45 | -setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | ||
46 | +setenv update_new 'run update_uboot; reset' | ||
47 | |||
48 | # Upgrade part 1, write new U-Boot, but with old ECC format still... | ||
49 | # Store config block temporarly in memory at kernel_addr_r. | ||
50 | @@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 | ||
51 | setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' | ||
52 | |||
53 | # Upgrade part 2, use new ECC format for the whole device... | ||
54 | -setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' | ||
55 | +setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}' | ||
56 | setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' | ||
57 | |||
58 | # fsl_nfc indicates old NAND format (24-bit ECC), start migration process | ||
59 | setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' | ||
60 | |||
61 | -echo 'enter "run update" to update the entire module' | ||
62 | +echo 'enter "run update" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr new file mode 100644 index 0000000..8fa5af9 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr | |||
@@ -0,0 +1,28 @@ | |||
1 | setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' | ||
2 | setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' | ||
3 | |||
4 | # Migrate to UBI volume based boot schema | ||
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | ||
6 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | ||
7 | setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' | ||
8 | |||
9 | setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' | ||
10 | setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | ||
11 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | ||
12 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
13 | |||
14 | setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | ||
15 | |||
16 | # Upgrade part 1, write new U-Boot, but with old ECC format still... | ||
17 | # Store config block temporarly in memory at kernel_addr_r. | ||
18 | setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' | ||
19 | setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' | ||
20 | |||
21 | # Upgrade part 2, use new ECC format for the whole device... | ||
22 | setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' | ||
23 | setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' | ||
24 | |||
25 | # fsl_nfc indicates old NAND format (24-bit ECC), start migration process | ||
26 | setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' | ||
27 | |||
28 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr new file mode 100644 index 0000000..aa98b3a --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr | |||
@@ -0,0 +1,28 @@ | |||
1 | setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' | ||
2 | setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' | ||
3 | |||
4 | # Migrate to UBI volume based boot schema | ||
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | ||
6 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | ||
7 | setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' | ||
8 | |||
9 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' | ||
10 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | ||
11 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | ||
12 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
13 | |||
14 | setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | ||
15 | |||
16 | # Upgrade part 1, write new U-Boot, but with old ECC format still... | ||
17 | # Store config block temporarly in memory at kernel_addr_r. | ||
18 | setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' | ||
19 | setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' | ||
20 | |||
21 | # Upgrade part 2, use new ECC format for the whole device... | ||
22 | setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' | ||
23 | setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' | ||
24 | |||
25 | # fsl_nfc indicates old NAND format (24-bit ECC), start migration process | ||
26 | setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' | ||
27 | |||
28 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr new file mode 100644 index 0000000..7af72e6 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr | |||
@@ -0,0 +1,11 @@ | |||
1 | #the update.sh script renames this. fwd_blk.scr -> ../flash_blk.img | ||
2 | test -n ${interface} || setenv interface mmc | ||
3 | test -n ${drive} || setenv drive 1 | ||
4 | test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf | ||
5 | test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf | ||
6 | test "${board_name}" = "colibri_imx7" && setenv drive 0 | ||
7 | test "${board_name}" = "colibri_t20" && setenv drive 0 | ||
8 | test "${board_name}" = "colibri_vf" && setenv drive 0 | ||
9 | |||
10 | test -n ${board_name} || echo "board_name env not set!" && exit | ||
11 | fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img && source ${loadaddr} | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr new file mode 100644 index 0000000..d7ea35c --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr | |||
@@ -0,0 +1,6 @@ | |||
1 | #the update.sh script renames this. fwd_eth.scr -> ../flash_eth.img | ||
2 | test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf | ||
3 | test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf | ||
4 | |||
5 | test -n ${board_name} || echo "board_name env not set!" && exit | ||
6 | tftpboot ${loadaddr} "${board_name}/flash_eth.img" && source ${loadaddr} | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr new file mode 100644 index 0000000..4c8f666 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr | |||
@@ -0,0 +1,3 @@ | |||
1 | #the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img | ||
2 | #flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions | ||
3 | fatload mmc ${drive}:1 ${loadaddr} flash_blk.img && source ${loadaddr} | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr deleted file mode 100644 index ee87e85..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | test -n ${interface} || setenv interface mmc | ||
2 | test -n ${drive} || setenv drive 1 | ||
3 | |||
4 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
5 | setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' | ||
6 | echo 'enter "run update_uboot" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr deleted file mode 100644 index 207c7db..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions | ||
2 | test -n ${interface} || setenv interface mmc | ||
3 | test -n ${drive} || setenv drive 1 | ||
4 | |||
5 | fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img | ||
6 | source ${loadaddr} | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr deleted file mode 100644 index be8ec8d..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' | ||
2 | echo 'enter "run update_uboot" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr deleted file mode 100644 index e0770a0..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | setenv interface mmc | ||
2 | fatload ${interface} 0:1 ${loadaddr} flash_blk.img | ||
3 | source ${loadaddr} | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch new file mode 100644 index 0000000..135dfd8 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch | |||
@@ -0,0 +1,86 @@ | |||
1 | From 4c748ee698961515c1602373f4f5d399c0a8e4a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 17:10:22 +0300 | ||
4 | Subject: [PATCH] Make sdboot default on all boards | ||
5 | |||
6 | --- | ||
7 | include/configs/apalis_imx6.h | 13 +++++++------ | ||
8 | include/configs/colibri_imx6.h | 3 ++- | ||
9 | include/configs/colibri_imx7.h | 2 +- | ||
10 | include/configs/colibri_vf.h | 2 +- | ||
11 | 4 files changed, 11 insertions(+), 9 deletions(-) | ||
12 | |||
13 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | ||
14 | index 3ea4a5c..53d9a0c 100644 | ||
15 | --- a/include/configs/apalis_imx6.h | ||
16 | +++ b/include/configs/apalis_imx6.h | ||
17 | @@ -252,14 +252,14 @@ | ||
18 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | ||
19 | |||
20 | #define SD_BOOTCMD \ | ||
21 | - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ | ||
22 | - "rootwait\0" \ | ||
23 | + "drive=2\0" \ | ||
24 | "sdboot=run setup; " \ | ||
25 | - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ | ||
26 | + "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ | ||
27 | + "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ | ||
28 | "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ | ||
29 | - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ | ||
30 | + "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ | ||
31 | "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ | ||
32 | - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ | ||
33 | + "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ | ||
34 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | ||
35 | |||
36 | #define USB_BOOTCMD \ | ||
37 | @@ -279,7 +279,8 @@ | ||
38 | #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" | ||
39 | #endif | ||
40 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
41 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
42 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | ||
43 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
44 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | ||
45 | "usb start ;" \ | ||
46 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | ||
47 | diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h | ||
48 | index adc2d1e..9fd5f4c 100644 | ||
49 | --- a/include/configs/colibri_imx6.h | ||
50 | +++ b/include/configs/colibri_imx6.h | ||
51 | @@ -245,7 +245,8 @@ | ||
52 | |||
53 | #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" | ||
54 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
55 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
56 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | ||
57 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
58 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | ||
59 | "usb start ;" \ | ||
60 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | ||
61 | diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h | ||
62 | index e585c81..f6267a7 100644 | ||
63 | --- a/include/configs/colibri_imx7.h | ||
64 | +++ b/include/configs/colibri_imx7.h | ||
65 | @@ -226,7 +226,7 @@ | ||
66 | "ubi read ${fdt_addr_r} dtb && " \ | ||
67 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ | ||
68 | |||
69 | -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" | ||
70 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" | ||
71 | |||
72 | #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 | ||
73 | |||
74 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h | ||
75 | index 26cf60a..33a3e3b 100644 | ||
76 | --- a/include/configs/colibri_vf.h | ||
77 | +++ b/include/configs/colibri_vf.h | ||
78 | @@ -185,7 +185,7 @@ | ||
79 | "ubi read ${fdt_addr_r} dtb && " \ | ||
80 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ | ||
81 | |||
82 | -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" | ||
83 | +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" | ||
84 | |||
85 | #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" | ||
86 | |||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch deleted file mode 100644 index 5a456c5..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 4569a8b4997340aae34365f2f896b842f8cc114b Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@digia.com> | ||
3 | Date: Mon, 27 Oct 2014 14:53:25 +0200 | ||
4 | Subject: [PATCH] Update default args for apalis imx6 | ||
5 | |||
6 | Boot from sd card by default | ||
7 | --- | ||
8 | include/configs/apalis_imx6.h | 13 +++++++------ | ||
9 | 1 file changed, 7 insertions(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h | ||
12 | index 3ea4a5c..53d9a0c 100644 | ||
13 | --- a/include/configs/apalis_imx6.h | ||
14 | +++ b/include/configs/apalis_imx6.h | ||
15 | @@ -252,14 +252,14 @@ | ||
16 | "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | ||
17 | |||
18 | #define SD_BOOTCMD \ | ||
19 | - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ | ||
20 | - "rootwait\0" \ | ||
21 | + "drive=2\0" \ | ||
22 | "sdboot=run setup; " \ | ||
23 | - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ | ||
24 | + "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ | ||
25 | + "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ | ||
26 | "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ | ||
27 | - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ | ||
28 | + "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ | ||
29 | "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ | ||
30 | - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ | ||
31 | + "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ | ||
32 | "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" | ||
33 | |||
34 | #define USB_BOOTCMD \ | ||
35 | @@ -279,7 +279,8 @@ | ||
36 | #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" | ||
37 | #endif | ||
38 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
39 | - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
40 | + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ | ||
41 | + "run emmcboot ; echo ; echo emmcboot failed ; " \ | ||
42 | "run nfsboot ; echo ; echo nfsboot failed ; " \ | ||
43 | "usb start ;" \ | ||
44 | "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ | ||
45 | -- | ||
46 | 1.9.1 | ||
47 | |||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch deleted file mode 100644 index 501ad33..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff -Naur git.orig/include/configs/colibri_imx7.h git/include/configs/colibri_imx7.h | ||
2 | --- git.orig/include/configs/colibri_imx7.h 2016-07-15 12:31:35.915934824 +0300 | ||
3 | +++ git/include/configs/colibri_imx7.h 2016-07-15 12:32:40.867937388 +0300 | ||
4 | @@ -248,7 +248,7 @@ | ||
5 | "${board}/flash_eth.img && source ${loadaddr}\0" \ | ||
6 | "setsdupdate=mmc rescan && setenv interface mmc && " \ | ||
7 | "fatload ${interface} 0:1 ${loadaddr} " \ | ||
8 | - "${board}/flash_blk.img && source ${loadaddr}\0" \ | ||
9 | + "/flash_blk.img && source ${loadaddr}\0" \ | ||
10 | "setup=setenv setupargs " \ | ||
11 | "console=tty1 console=${console}" \ | ||
12 | ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \ | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch deleted file mode 100644 index b54a4ae..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From f480a948551b0e5592d93cb7a5dc1653de900909 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Wed, 24 Feb 2016 16:01:33 +0200 | ||
4 | Subject: [PATCH] colibri vf: remove console from tty1 | ||
5 | |||
6 | --- | ||
7 | include/configs/colibri_vf.h | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h | ||
11 | index b870812..0726fc5 100644 | ||
12 | --- a/include/configs/colibri_vf.h | ||
13 | +++ b/include/configs/colibri_vf.h | ||
14 | @@ -202,7 +202,7 @@ | ||
15 | "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ | ||
16 | "source ${loadaddr}\0" \ | ||
17 | "setup=setenv setupargs " \ | ||
18 | - "console=tty1 console=${console}" \ | ||
19 | + "console=${console}" \ | ||
20 | ",${baudrate}n8 ${memargs} consoleblank=0\0" \ | ||
21 | "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ | ||
22 | "setusbupdate=usb start && setenv interface usb && " \ | ||
23 | -- | ||
24 | 1.9.1 | ||
25 | |||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch deleted file mode 100644 index 25476dd..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | diff -Naur git.orig/include/configs/colibri_vf.h git/include/configs/colibri_vf.h | ||
2 | --- git.orig/include/configs/colibri_vf.h 2016-07-15 12:05:41.263873456 +0300 | ||
3 | +++ git/include/configs/colibri_vf.h 2016-07-15 12:06:19.759874976 +0300 | ||
4 | @@ -161,8 +161,8 @@ | ||
5 | "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \ | ||
6 | "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \ | ||
7 | "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ | ||
8 | - "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ | ||
9 | - "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ | ||
10 | + "load mmc 0:1 ${kernel_addr_r} /${kernel_file} && " \ | ||
11 | + "load mmc 0:1 ${fdt_addr_r} /${soc}-colibri-${fdt_board}.dtb && " \ | ||
12 | "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ | ||
13 | |||
14 | #define NFS_BOOTCMD \ | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend index cb94605..9f98fc3 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend | |||
@@ -27,17 +27,18 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | PV = "v2015.04-v2.6b2.1+git${SRCPV}" | ||
31 | SRCREV_b2qt = "90a974d34aaa85d5ce69f83067928592c5389990" | ||
32 | SRCBRANCH = "2015.04-toradex" | ||
33 | COMPATIBLE_MACHINE = "(mx6|mx7|vf)" | ||
34 | |||
35 | do_deploy_append_apalis-imx6() { | ||
36 | cd ${DEPLOYDIR} | ||
37 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} | ||
38 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} | ||
39 | } | ||
40 | |||
30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 41 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
31 | SRC_URI += " \ | 42 | SRC_URI += " \ |
32 | file://0001-colibri-vf-remove-console-from-tty1.patch \ | 43 | file://0001-Make-sdboot-default-on-all-boards.patch \ |
33 | file://0002-colibri-vf-fix-mmc-boot.patch \ | ||
34 | file://0001-Update-default-args-for-apalis-imx6.patch \ | ||
35 | file://0001-colibri-imx7-fix-update-u-boot.patch \ | ||
36 | " | 44 | " |
37 | |||
38 | do_compile_append () { | ||
39 | if [ "${MACHINE}" = "colibri-vf" ]; then | ||
40 | oe_runmake u-boot-nand.imx | ||
41 | fi | ||
42 | |||
43 | } | ||
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend index 544e48f..d2eb2b7 100644 --- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend +++ b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend | |||
@@ -28,8 +28,8 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | do_deploy_append() { | 30 | do_deploy_append() { |
31 | if [ "${RPI_FT5604}" = "1" ]; then | 31 | if [ "${RPI_FT5406}" = "1" ]; then |
32 | echo "# Enable rpi-ft5604 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 32 | echo "# Enable rpi-ft5406 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
33 | echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 33 | echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
34 | fi | 34 | fi |
35 | } | 35 | } |
diff --git a/meta-renesas-extras/recipes/adbd/files/defaults b/meta-renesas-extras/recipes/adbd/files/defaults index 0fbba4c..d2a3cc0 100644 --- a/meta-renesas-extras/recipes/adbd/files/defaults +++ b/meta-renesas-extras/recipes/adbd/files/defaults | |||
@@ -1,4 +1,4 @@ | |||
1 | VENDOR=0x18d1 | 1 | VENDOR=0x18d1 |
2 | PRODUCT=0x0000 | 2 | PRODUCT=0x0000 |
3 | SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) | 3 | SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) |
4 | USE_ETHERNET=yes | 4 | USE_ETHERNET=no |
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg index 6ecc61e..1c60d89 100644 --- a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg +++ b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg | |||
@@ -62,6 +62,18 @@ CONFIG_RFKILL=m | |||
62 | CONFIG_FHANDLE=y | 62 | CONFIG_FHANDLE=y |
63 | CONFIG_USB_NAMESPACES=m | 63 | CONFIG_USB_NAMESPACES=m |
64 | 64 | ||
65 | # HID support | ||
66 | CONFIG_HID=m | ||
67 | CONFIG_HID_BATTERY_STRENGTH=y | ||
68 | CONFIG_HIDRAW=y | ||
69 | CONFIG_UHID=m | ||
70 | CONFIG_HID_GENERIC=m | ||
71 | |||
72 | # USB HID support | ||
73 | CONFIG_USB_HID=m | ||
74 | CONFIG_HID_PID=y | ||
75 | CONFIG_USB_HIDDEV=y | ||
76 | |||
65 | # needed for USB touchscreens | 77 | # needed for USB touchscreens |
66 | CONFIG_HID_MULTITOUCH=y | 78 | CONFIG_HID_MULTITOUCH=y |
67 | 79 | ||
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch new file mode 100644 index 0000000..c61a4dc --- /dev/null +++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 56e321cd19ee4909ca623ce1c351c966904123a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pantelis Antoniou <panto@antoniou-consulting.com> | ||
3 | Date: Fri, 4 Jan 2013 00:32:33 +0200 | ||
4 | Subject: [PATCH] arm: Export cache flush management symbols when !MULTI_CACHE | ||
5 | |||
6 | When compiling a kernel without CONFIG_MULTI_CACHE enabled the | ||
7 | dma access functions end up not being exported. Fix it. | ||
8 | |||
9 | Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> | ||
10 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
11 | --- | ||
12 | arch/arm/kernel/setup.c | 9 +++++++++ | ||
13 | 1 file changed, 9 insertions(+) | ||
14 | |||
15 | diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c | ||
16 | index 1e8b030..c6a9a61 100644 | ||
17 | --- a/arch/arm/kernel/setup.c | ||
18 | +++ b/arch/arm/kernel/setup.c | ||
19 | @@ -1080,3 +1080,12 @@ const struct seq_operations cpuinfo_op = { | ||
20 | .stop = c_stop, | ||
21 | .show = c_show | ||
22 | }; | ||
23 | + | ||
24 | +/* export the cache management functions */ | ||
25 | +#ifndef MULTI_CACHE | ||
26 | + | ||
27 | +EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area)); | ||
28 | +EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area)); | ||
29 | +EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range)); | ||
30 | + | ||
31 | +#endif | ||
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend index ea88489..1bcbb80 100644 --- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend +++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend | |||
@@ -31,6 +31,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | |||
31 | SRC_URI += " \ | 31 | SRC_URI += " \ |
32 | file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ | 32 | file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ |
33 | file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch \ | 33 | file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch \ |
34 | file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \ | ||
34 | " | 35 | " |
35 | 36 | ||
36 | do_configure_prepend() { | 37 | do_configure_prepend() { |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index d270cc0..eafae4e 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb | |||
@@ -31,18 +31,15 @@ DESCRIPTION = "Boot to Qt Appcontroller" | |||
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "The-Qt-Company-DCLA-2.1" |
32 | LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" | 32 | LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" |
33 | 33 | ||
34 | inherit qmake5 sdk-sources | 34 | inherit qmake5 |
35 | require recipes-qt/qt5/qt5-git.inc | ||
35 | 36 | ||
36 | SRC_URI = " \ | 37 | SRC_URI = " \ |
37 | git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-appcontroller/ \ | 38 | git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \ |
38 | file://appcontroller.conf \ | 39 | file://appcontroller.conf \ |
39 | " | 40 | " |
40 | 41 | ||
41 | SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" | 42 | SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" |
42 | BRANCH = "5.7" | ||
43 | PV = "5.7+git${SRCPV}" | ||
44 | |||
45 | S = "${WORKDIR}/git" | ||
46 | 43 | ||
47 | DEPENDS = "qtbase" | 44 | DEPENDS = "qtbase" |
48 | 45 | ||
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb index 25a567d..391224e 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb | |||
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | |||
36 | 36 | ||
37 | RDEPENDS_${PN} += " \ | 37 | RDEPENDS_${PN} += " \ |
38 | b2qt-appcontroller \ | 38 | b2qt-appcontroller \ |
39 | b2qt-utils \ | ||
40 | qtivi \ | 39 | qtivi \ |
41 | neptune-ui \ | 40 | neptune-ui \ |
42 | neptune-ui-apps \ | 41 | neptune-ui-apps \ |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index 9c2008d..3d60eed 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | |||
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | |||
36 | 36 | ||
37 | RDEPENDS_${PN} += " \ | 37 | RDEPENDS_${PN} += " \ |
38 | b2qt-appcontroller \ | 38 | b2qt-appcontroller \ |
39 | b2qt-utils \ | ||
40 | b2qt-launcher \ | 39 | b2qt-launcher \ |
41 | b2qt-demos \ | 40 | b2qt-demos \ |
42 | ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ | 41 | ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index cd1f2d8..ed7c8dc 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
@@ -44,11 +44,14 @@ RDEPENDS_${PN} += " \ | |||
44 | qt3d-dev \ | 44 | qt3d-dev \ |
45 | qtbase-dev \ | 45 | qtbase-dev \ |
46 | qtbase-staticdev \ | 46 | qtbase-staticdev \ |
47 | qtcanvas3d \ | 47 | qtcanvas3d-dev \ |
48 | qtcharts-dev \ | ||
48 | qtconnectivity-dev \ | 49 | qtconnectivity-dev \ |
50 | qtdatavis3d-dev \ | ||
49 | qtdeclarative-dev \ | 51 | qtdeclarative-dev \ |
50 | qtdeclarative-render2d-dev \ | 52 | qtdeclarative-render2d-dev \ |
51 | qtdeclarative-staticdev \ | 53 | qtdeclarative-staticdev \ |
54 | qtdeviceutilities-dev \ | ||
52 | qtgraphicaleffects-dev \ | 55 | qtgraphicaleffects-dev \ |
53 | qtimageformats-dev \ | 56 | qtimageformats-dev \ |
54 | qtlocation-dev \ | 57 | qtlocation-dev \ |
@@ -61,14 +64,10 @@ RDEPENDS_${PN} += " \ | |||
61 | qtsvg-dev \ | 64 | qtsvg-dev \ |
62 | qttools-dev \ | 65 | qttools-dev \ |
63 | qttools-staticdev \ | 66 | qttools-staticdev \ |
67 | qtvirtualkeyboard-dev \ | ||
64 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ | 68 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ |
65 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ | 69 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ |
66 | qtwebsockets-dev \ | 70 | qtwebsockets-dev \ |
67 | qtwebchannel-dev \ | 71 | qtwebchannel-dev \ |
68 | qtxmlpatterns-dev \ | 72 | qtxmlpatterns-dev \ |
69 | \ | ||
70 | b2qt-utils-dev \ | ||
71 | qtcharts-dev \ | ||
72 | qtdatavis3d-dev \ | ||
73 | qtvirtualkeyboard-dev \ | ||
74 | " | 73 | " |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 06de528..7d7160d 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | |||
@@ -44,6 +44,7 @@ RDEPENDS_${PN} += " \ | |||
44 | qtdeclarative \ | 44 | qtdeclarative \ |
45 | qtdeclarative-render2d \ | 45 | qtdeclarative-render2d \ |
46 | qtdeclarative-tools \ | 46 | qtdeclarative-tools \ |
47 | qtdeviceutilities \ | ||
47 | qtgraphicaleffects \ | 48 | qtgraphicaleffects \ |
48 | qtimageformats \ | 49 | qtimageformats \ |
49 | qtlocation \ | 50 | qtlocation \ |
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/qt5/qtdeviceutilities.bb index 7579777..a4c0418 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb | |||
@@ -27,20 +27,22 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Boot to Qt Utils module" | 30 | DESCRIPTION = "Qt Device Utilities" |
31 | LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" | 31 | LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" |
32 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" | 32 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" |
33 | 33 | ||
34 | inherit qt5-module sdk-sources | 34 | inherit qt5-module |
35 | require recipes-qt/qt5/qt5-git.inc | ||
36 | |||
37 | PACKAGECONFIG ??= "" | ||
38 | PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" | ||
39 | |||
40 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | ||
35 | 41 | ||
36 | SRC_URI = " \ | 42 | SRC_URI = " \ |
37 | git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-utils \ | 43 | git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ |
38 | " | 44 | " |
39 | 45 | ||
40 | SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" | 46 | SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" |
41 | BRANCH = "5.7" | ||
42 | PV = "5.7+git${SRCPV}" | ||
43 | |||
44 | S = "${WORKDIR}/git" | ||
45 | 47 | ||
46 | DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity" | 48 | DEPENDS = "qtbase qtdeclarative qtconnectivity" |
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index f38088c..75d5bd5 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb | |||
@@ -49,7 +49,7 @@ SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" | |||
49 | 49 | ||
50 | S = "${WORKDIR}/git" | 50 | S = "${WORKDIR}/git" |
51 | 51 | ||
52 | DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz" | 52 | DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd" |
53 | # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. | 53 | # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. |
54 | # The production image do not require bash for proper working. | 54 | # The production image do not require bash for proper working. |
55 | RDEPENDS_${PN} += "bash" | 55 | RDEPENDS_${PN} += "bash" |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index a0efef9..17b278c 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | |||
@@ -43,5 +43,6 @@ RDEPENDS_${PN} = "\ | |||
43 | ntp \ | 43 | ntp \ |
44 | connman-client \ | 44 | connman-client \ |
45 | iproute2 \ | 45 | iproute2 \ |
46 | rsync \ | ||
46 | ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ | 47 | ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ |
47 | " | 48 | " |
diff --git a/recipes/samba/samba_4.%.bbappend b/recipes/samba/samba_4.%.bbappend new file mode 100644 index 0000000..4a86809 --- /dev/null +++ b/recipes/samba/samba_4.%.bbappend | |||
@@ -0,0 +1,31 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | DEPENDS += "perl" | ||
31 | |||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index de3e1b1..2ad25df 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -8,7 +8,7 @@ | |||
8 | <remote fetch="git://github.com/Freescale" name="freescale"/> | 8 | <remote fetch="git://github.com/Freescale" name="freescale"/> |
9 | <remote fetch="git://github.com/architech-boards" name="architech"/> | 9 | <remote fetch="git://github.com/architech-boards" name="architech"/> |
10 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> | 10 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> |
11 | <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/> | 11 | <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> |
12 | <remote fetch="git://git.yoctoproject.org" name="intel"/> | 12 | <remote fetch="git://git.yoctoproject.org" name="intel"/> |
13 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> | 13 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> |
14 | <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> | 14 | <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> |