diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-17 15:49:18 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-07 08:37:57 +0000 |
commit | 6a16112651c0ff8ea14ffcbf120c4e5697492587 (patch) | |
tree | bc2b6b04326b3a306e939e7f3ba607e87f32ef68 | |
parent | 66a40654eb6a577cb2b6d54e6ef5c10cdffe7cdb (diff) | |
download | meta-boot2qt-6a16112651c0ff8ea14ffcbf120c4e5697492587.tar.gz |
toradex: add support for colibri-imx6ull
All u-boot scripts updated and one added for colibri-imx6ull.
Colibri-imx6ull supports tezi, but has same size limitation
as colibri-imx7.
Task-number: QTBUG-70052
Change-Id: Ia05f15c27ceff2b643470c08c3c1be6ace209fb4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
18 files changed, 172 insertions, 67 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 363d749..5aa39f1 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -109,7 +109,7 @@ get_groups() { | |||
109 | apalis-imx8|imx8qmlpddr4arm2) | 109 | apalis-imx8|imx8qmlpddr4arm2) |
110 | PROJECT_GROUPS="fsl-imx8" | 110 | PROJECT_GROUPS="fsl-imx8" |
111 | ;; | 111 | ;; |
112 | apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) | 112 | apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7) |
113 | PROJECT_GROUPS="toradex" | 113 | PROJECT_GROUPS="toradex" |
114 | ;; | 114 | ;; |
115 | nitrogen6x|nitrogen7) | 115 | nitrogen6x|nitrogen7) |
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf new file mode 100644 index 0000000..9090055 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf | |||
@@ -0,0 +1,50 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2018 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 | include conf/distro/include/toradex.inc | ||
31 | |||
32 | DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL" | ||
33 | |||
34 | IMAGE_FSTYPES += "teziimg" | ||
35 | |||
36 | QBSP_IMAGE_CONTENT += "\ | ||
37 | ${IMAGE_LINK_NAME}.tezi.tar \ | ||
38 | " | ||
39 | |||
40 | BOOT_SCRIPTS += " \ | ||
41 | u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \ | ||
42 | " | ||
43 | |||
44 | PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy" | ||
45 | PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy" | ||
46 | |||
47 | DISTRO_FEATURES_remove = "webengine wayland" | ||
48 | |||
49 | # try to limit the maximum size of the tezi image | ||
50 | RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" | ||
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri new file mode 100644 index 0000000..9c4f92f --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri | |||
@@ -0,0 +1,2 @@ | |||
1 | QMAKE_PLATFORM += boot2qt | ||
2 | QT_QPA_DEFAULT_PLATFORM = linuxfb | ||
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf new file mode 100644 index 0000000..38d06e6 --- /dev/null +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf | |||
@@ -0,0 +1,9 @@ | |||
1 | env=QMLSCENE_DEVICE=softwarecontext | ||
2 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | ||
3 | env=QT_QPA_PLATFORM=linuxfb | ||
4 | env=QSG_RENDER_LOOP=basic | ||
5 | env=QT_IM_MODULE=qtvirtualkeyboard | ||
6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | ||
7 | env=XDG_RUNTIME_DIR=/run/user/0 | ||
8 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | ||
9 | base=linux | ||
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 00a111f..136fb80 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 | |||
@@ -67,7 +67,6 @@ addtask deploy after do_install before do_build | |||
67 | 67 | ||
68 | do_compile[noexec] = "1" | 68 | do_compile[noexec] = "1" |
69 | do_install[noexec] = "1" | 69 | do_install[noexec] = "1" |
70 | do_populate_sysroot[noexec] = "1" | ||
71 | 70 | ||
72 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 71 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
73 | COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)" | 72 | COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)" |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..999828e --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From c563131a55ebf0f2956d5e6df400c45ae72cff38 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 | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
11 | index b8b8a93..824b6dc 100644 | ||
12 | --- a/flash_blk.scr | ||
13 | +++ b/flash_blk.scr | ||
14 | @@ -10,6 +10,6 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag | ||
15 | setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' | ||
16 | setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' | ||
17 | |||
18 | -setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
19 | +setenv update 'mtdparts default && run update_uboot && reset' | ||
20 | |||
21 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr new file mode 100644 index 0000000..b8b8a93 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr | |||
@@ -0,0 +1,15 @@ | |||
1 | setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000' | ||
2 | setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800' | ||
3 | |||
4 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | ||
5 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | ||
6 | setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_kernel_fdt && && run prepare_rootfs; fi' | ||
7 | |||
8 | setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}' | ||
9 | setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' | ||
10 | setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' | ||
11 | setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' | ||
12 | |||
13 | setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
14 | |||
15 | echo 'enter "run update" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr new file mode 100644 index 0000000..c65c1d3 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr | |||
@@ -0,0 +1,15 @@ | |||
1 | setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000' | ||
2 | setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800' | ||
3 | |||
4 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | ||
5 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | ||
6 | setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_kernel_fdt && && run prepare_rootfs; fi' | ||
7 | |||
8 | setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}' | ||
9 | setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' | ||
10 | setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' | ||
11 | setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' | ||
12 | |||
13 | setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
14 | |||
15 | 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 index 932f228..cf90c35 100644 --- 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 | |||
@@ -12,8 +12,8 @@ diff --git a/flash_blk.scr b/flash_blk.scr | |||
12 | index cc4cf38..b63366a 100644 | 12 | index cc4cf38..b63366a 100644 |
13 | --- a/flash_blk.scr | 13 | --- a/flash_blk.scr |
14 | +++ b/flash_blk.scr | 14 | +++ b/flash_blk.scr |
15 | @@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-col | 15 | @@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-col |
16 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 16 | setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' |
17 | 17 | ||
18 | # Test which version of U-Boot we are currently running on | 18 | # Test which version of U-Boot we are currently running on |
19 | -setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' | 19 | -setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
@@ -25,8 +25,8 @@ diff --git a/flash_eth.scr b/flash_eth.scr | |||
25 | index 01be124..13025de 100644 | 25 | index 01be124..13025de 100644 |
26 | --- a/flash_eth.scr | 26 | --- a/flash_eth.scr |
27 | +++ b/flash_eth.scr | 27 | +++ b/flash_eth.scr |
28 | @@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board | 28 | @@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board |
29 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 29 | setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' |
30 | 30 | ||
31 | # Test which version of U-Boot we are currently running on | 31 | # Test which version of U-Boot we are currently running on |
32 | -setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' | 32 | -setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
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 index f1e73bb..9fa6296 100644 --- 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' | 1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' |
2 | setenv recreate_bcb 'nand read ${loadaddr} 0x800 0x800 && run create_bcb && nand write ${loadaddr} 0x800 0x800' | 2 | setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800' |
3 | 3 | ||
4 | # Migrate to UBI volume based boot schema | 4 | # Migrate to UBI volume based boot schema |
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | 5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' |
@@ -8,11 +8,11 @@ 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' | 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 | 9 | ||
10 | setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"' | 10 | setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"' |
11 | setenv update_uboot_old '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 && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg' | 11 | setenv update_uboot_old 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${fdt_addr_r} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg' |
12 | setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${loadaddr} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${loadaddr} u-boot2 ${filesize}' | 12 | setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}' |
13 | setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | 13 | setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' |
14 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 14 | setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' |
15 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 15 | setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' |
16 | 16 | ||
17 | # Test which version of U-Boot we are currently running on | 17 | # Test which version of U-Boot we are currently running on |
18 | setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' | 18 | setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
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 index 66cd29d..20244d7 100644 --- 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' | 1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' |
2 | setenv recreate_bcb 'nand read ${loadaddr} 0x800 0x800 && run create_bcb && nand write ${loadaddr} 0x800 0x800' | 2 | setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800' |
3 | 3 | ||
4 | # Migrate to UBI volume based boot schema | 4 | # Migrate to UBI volume based boot schema |
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | 5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' |
@@ -8,11 +8,11 @@ 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' | 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 | 9 | ||
10 | setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"' | 10 | setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"' |
11 | setenv update_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg' | 11 | setenv update_uboot_old 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${fdt_addr_r} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg' |
12 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${loadaddr} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${loadaddr} u-boot2 ${filesize}' | 12 | setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}' |
13 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | 13 | setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' |
14 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 14 | setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' |
15 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 15 | setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' |
16 | 16 | ||
17 | # Test which version of U-Boot we are currently running on | 17 | # Test which version of U-Boot we are currently running on |
18 | setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' | 18 | setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
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 index f096c2e..86d21fd 100644 --- 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 | |||
@@ -12,9 +12,9 @@ diff --git a/flash_blk.scr b/flash_blk.scr | |||
12 | index 401c47a..8fa5af9 100644 | 12 | index 401c47a..8fa5af9 100644 |
13 | --- a/flash_blk.scr | 13 | --- a/flash_blk.scr |
14 | +++ b/flash_blk.scr | 14 | +++ b/flash_blk.scr |
15 | @@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage | 15 | @@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage |
16 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 16 | setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${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}' | 17 | setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' |
18 | 18 | ||
19 | -setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | 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' | 20 | +setenv update_new 'run update_uboot; reset' |
@@ -38,9 +38,9 @@ diff --git a/flash_eth.scr b/flash_eth.scr | |||
38 | index 15aab1c..aa98b3a 100644 | 38 | index 15aab1c..aa98b3a 100644 |
39 | --- a/flash_eth.scr | 39 | --- a/flash_eth.scr |
40 | +++ b/flash_eth.scr | 40 | +++ b/flash_eth.scr |
41 | @@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${l | 41 | @@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${l |
42 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 42 | setenv update_fdt 'tftpboot ${fdt_addr_r} ${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}' | 43 | setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' |
44 | 44 | ||
45 | -setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | 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' | 46 | +setenv update_new 'run update_uboot; reset' |
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 index 8fa5af9..ae0fd5c 100644 --- 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 | |||
@@ -1,15 +1,15 @@ | |||
1 | setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' | 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}' | 2 | setenv update_configblock 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 0x800 ${filesize}' |
3 | 3 | ||
4 | # Migrate to UBI volume based boot schema | 4 | # Migrate to UBI volume based boot schema |
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | 5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' |
6 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | 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' | 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 | 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' | 9 | setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot' |
10 | setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | 10 | setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' |
11 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 11 | setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' |
12 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 12 | setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' |
13 | 13 | ||
14 | setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | 14 | setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' |
15 | 15 | ||
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 index aa98b3a..b0e4904 100644 --- 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 | |||
@@ -1,15 +1,15 @@ | |||
1 | setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' | 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}' | 2 | setenv update_configblock 'tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 0x800 ${filesize}' |
3 | 3 | ||
4 | # Migrate to UBI volume based boot schema | 4 | # Migrate to UBI volume based boot schema |
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | 5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' |
6 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | 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' | 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 | 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' | 9 | setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot' |
10 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | 10 | setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' |
11 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 11 | setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' |
12 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 12 | setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' |
13 | 13 | ||
14 | setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' | 14 | setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' |
15 | 15 | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch index a1e70ba..91aa2bc 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 25c3ac90c9d0313e4f7d99a68886f8f43d5a0b52 Mon Sep 17 00:00:00 2001 | 1 | From 735a68d1e110edead4b858499c8d97be3e90d0f8 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Mon, 15 May 2017 14:04:38 +0300 | 3 | Date: Mon, 15 May 2017 14:04:38 +0300 |
4 | Subject: [PATCH] Update only u-boot | 4 | Subject: [PATCH] Update only u-boot |
@@ -8,13 +8,13 @@ Subject: [PATCH] Update only u-boot | |||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/flash_blk.scr b/flash_blk.scr | 10 | diff --git a/flash_blk.scr b/flash_blk.scr |
11 | index ec3e00b..367b910 100644 | 11 | index 5c75100..5c8486d 100644 |
12 | --- a/flash_blk.scr | 12 | --- a/flash_blk.scr |
13 | +++ b/flash_blk.scr | 13 | +++ b/flash_blk.scr |
14 | @@ -41,7 +41,7 @@ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migr | 14 | @@ -38,7 +38,7 @@ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migr |
15 | 15 | ||
16 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC | 16 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC |
17 | setenv update_to_spl 'mmc dev 0 1; mmc read $loadaddr 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' | 17 | setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' |
18 | -setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | 18 | -setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' |
19 | +setenv update_latest 'run update_to_spl; run update_uboot' | 19 | +setenv update_latest 'run update_to_spl; run update_uboot' |
20 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed | 20 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed |
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 index ec3e00b..5c75100 100644 --- 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 | |||
@@ -7,30 +7,27 @@ setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt | |||
7 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | 7 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' |
8 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | 8 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' |
9 | 9 | ||
10 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | 10 | setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' |
11 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
12 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
13 | 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' | ||
14 | 11 | ||
15 | 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 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${fdt_addr_r} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' |
16 | 13 | ||
17 | setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1' | 14 | setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1' |
18 | setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | 15 | setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' |
19 | 16 | ||
20 | setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3-${filenum} ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | 17 | setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}' |
21 | 18 | ||
22 | setenv update_spl 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 2 ${blkcnt}' | 19 | setenv update_spl 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}' |
23 | setenv update_uboot_bin 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 8a ${blkcnt}' | 20 | setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}' |
24 | setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | 21 | setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' |
25 | 22 | ||
26 | setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | 23 | setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' |
27 | 24 | ||
28 | setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | 25 | setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}' |
29 | 26 | ||
30 | 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 | setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' |
31 | 28 | ||
32 | setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | 29 | setenv update_1 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1' |
33 | 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 | setenv update_2 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}' |
34 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | 31 | #do it in chunks of 64M to fit into DDR RAM of the smallest module |
35 | setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | 32 | setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' |
36 | 33 | ||
@@ -40,7 +37,7 @@ setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migr | |||
40 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | 37 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' |
41 | 38 | ||
42 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC | 39 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC |
43 | setenv update_to_spl 'mmc dev 0 1; mmc read $loadaddr 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' | 40 | setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' |
44 | setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | 41 | setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' |
45 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed | 42 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed |
46 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | 43 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr index 77e2ac9..16f91e8 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr | |||
@@ -5,30 +5,27 @@ setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt | |||
5 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | 5 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' |
6 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | 6 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' |
7 | 7 | ||
8 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | 8 | setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' |
9 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
10 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
11 | 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' | ||
12 | 9 | ||
13 | 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' | 10 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${fdt_addr_r} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' |
14 | 11 | ||
15 | setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1' | 12 | setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1' |
16 | setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | 13 | setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' |
17 | 14 | ||
18 | setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | 15 | setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}' |
19 | 16 | ||
20 | setenv update_spl 'tftpboot ${loadaddr} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 2 ${blkcnt}' | 17 | setenv update_spl 'tftpboot ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}' |
21 | setenv update_uboot_bin 'tftpboot ${loadaddr} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 8a ${blkcnt}' | 18 | setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}' |
22 | setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | 19 | setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' |
23 | 20 | ||
24 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | 21 | setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' |
25 | 22 | ||
26 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | 23 | setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}' |
27 | 24 | ||
28 | setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | 25 | setenv update_configblock 'run check_configblock; tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1' |
29 | 26 | ||
30 | setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | 27 | setenv update_1 'tftpboot ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1' |
31 | setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | 28 | setenv update_2 'tftpboot ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}' |
32 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | 29 | #do it in chunks of 64M to fit into DDR RAM of the smallest module |
33 | setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | 30 | setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' |
34 | 31 | ||
@@ -38,7 +35,7 @@ setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migr | |||
38 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | 35 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' |
39 | 36 | ||
40 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC | 37 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC |
41 | setenv update_to_spl 'mmc dev 0 1; mmc read $loadaddr 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' | 38 | setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' |
42 | setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | 39 | setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' |
43 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed | 40 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed |
44 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | 41 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' |
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index c0e8f79..44f529c 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -59,7 +59,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
59 | apalis-imx8|imx8qmlpddr4arm2) | 59 | apalis-imx8|imx8qmlpddr4arm2) |
60 | LAYERSCONF="bblayers.conf.fsl-imx8.sample" | 60 | LAYERSCONF="bblayers.conf.fsl-imx8.sample" |
61 | ;; | 61 | ;; |
62 | apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) | 62 | apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7) |
63 | LAYERSCONF="bblayers.conf.toradex.sample" | 63 | LAYERSCONF="bblayers.conf.toradex.sample" |
64 | ;; | 64 | ;; |
65 | nitrogen6x|nitrogen7) | 65 | nitrogen6x|nitrogen7) |