diff options
4 files changed, 19 insertions, 2 deletions
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 310a6a0..722da17 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
@@ -32,6 +32,11 @@ BOOTFS_CONTENT = "\ | |||
32 | ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ | 32 | ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ |
33 | u-boot-${MACHINE}.imx:u-boot.imx \ | 33 | u-boot-${MACHINE}.imx:u-boot.imx \ |
34 | " | 34 | " |
35 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | 35 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
36 | BOOT_SCRIPTS += " \ | ||
37 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
38 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
39 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
40 | " | ||
36 | 41 | ||
37 | DISTRO_FEATURES_remove = "webengine" | 42 | DISTRO_FEATURES_remove = "webengine" |
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb index 420cfe0..bb209ad 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb | |||
@@ -73,4 +73,4 @@ do_install[noexec] = "1" | |||
73 | do_populate_sysroot[noexec] = "1" | 73 | do_populate_sysroot[noexec] = "1" |
74 | 74 | ||
75 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 75 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
76 | COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6)" | 76 | COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)" |
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr new file mode 100644 index 0000000..ee87e85 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr | |||
@@ -0,0 +1,6 @@ | |||
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-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr new file mode 100644 index 0000000..152982c --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr | |||
@@ -0,0 +1,6 @@ | |||
1 | #flash_mmc has been renamed to flash_blk, ensure compatibility 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} | ||