From d5701b77c7558f9906927a6fe52531d68d95c1d2 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 16 Nov 2017 20:51:18 +0100 Subject: colibri-imx6ull: add dtb for wifi variant Deploy the device tree for the Colibri iMX6ULL 512MB Wi-Fi / BT and choose the write one to flash into its UBI partition. Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- .../images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr | 2 +- .../images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr | 2 +- recipes-images/images/files/colibri-imx6ull/update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr index fd229a0..b8b8a93 100644 --- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr +++ b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr @@ -7,7 +7,7 @@ setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_k 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}' setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' -setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/i${soc}ull-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' +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}' setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr index 4028c42..c65c1d3 100644 --- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr +++ b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr @@ -7,7 +7,7 @@ setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_k 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}' setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' -setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/i${soc}ull-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' +setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' diff --git a/recipes-images/images/files/colibri-imx6ull/update.sh b/recipes-images/images/files/colibri-imx6ull/update.sh index 76339c5..266a718 100755 --- a/recipes-images/images/files/colibri-imx6ull/update.sh +++ b/recipes-images/images/files/colibri-imx6ull/update.sh @@ -67,7 +67,7 @@ Usage() } # initialise options -KERNEL_DEVICETREE="imx6ull-colibri-eval-v3.dtb" +KERNEL_DEVICETREE="imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" KERNEL_IMAGETYPE="zImage" MODTYPE_DETECT=0 -- cgit v1.2.3