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 /meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch | |
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
Diffstat (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch')
-rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch | 52 |
1 files changed, 52 insertions, 0 deletions
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' | ||