toradex: update to latest release

Update toradex layers to 2.8b3 (rocko) and make the necessary
adaptations. Use WIC for image creation.

Change-Id: I7f7cc76e6c215c9edba1bcbede796b78f08b258c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

10 files changed, 59 insertions, 68 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 58dc715..9298747 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree"
 
 do_preconfigure_prepend () {
     # FunctionFS for qdbd
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 136fb80..ff25ec5 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
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,7 +31,7 @@ LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 DEPENDS = "u-boot-mkimage-native"
 
-PV = "2.7"
+PV = "2.8b3"
 
 SRC_URI = " \
     file://fwd_mmc.scr \
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 cf90c35..2235fae 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
@@ -1,19 +1,19 @@
-From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001
+From 7e05ac9e6dc984bd060d766740ff494e0e3519d7 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 14 Sep 2016 10:19:28 +0300
 Subject: [PATCH] Update only u-boot
 
 ---
- flash_blk.scr   | 4 ++--
- flash_eth.scr   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ flash_blk.scr | 2 +-
+ flash_eth.scr | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/flash_blk.scr b/flash_blk.scr
-index cc4cf38..b63366a 100644
+index 9fa6296..e599070 100644
 --- a/flash_blk.scr
 +++ b/flash_blk.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-col
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+@@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-c
+ setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
  
  # Test which version of U-Boot we are currently running on
 -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'
@@ -22,11 +22,11 @@ index cc4cf38..b63366a 100644
  if itest.b *0x30360800 -lt 0x11; then
  echo &&
 diff --git a/flash_eth.scr b/flash_eth.scr
-index 01be124..13025de 100644
+index 20244d7..7f3372c 100644
 --- a/flash_eth.scr
 +++ b/flash_eth.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board
- setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+@@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_boa
+ setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
  
  # Test which version of U-Boot we are currently running on
 -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 86d21fd..2aa8421 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
@@ -1,27 +1,27 @@
-From 2b11117dcc616843a6dce1a5e97fcecefa7e3f4b Mon Sep 17 00:00:00 2001
+From 7d0fc874871d79125b1c17b32fec9742b2f5839e Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 14 Sep 2016 10:22:27 +0300
 Subject: [PATCH] Update only u-boot
 
 ---
- flash_blk.scr   | 6 +++---
- flash_eth.scr   | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ flash_blk.scr | 4 ++--
+ flash_eth.scr | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/flash_blk.scr b/flash_blk.scr
-index 401c47a..8fa5af9 100644
+index ae0fd5c..1b34c75 100644
 --- a/flash_blk.scr
 +++ b/flash_blk.scr
-@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage
- setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag
+ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${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_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
 +setenv update_new 'run update_uboot; reset'
  
  # Upgrade part 1, write new U-Boot, but with old ECC format still...
  # Store config block temporarly in memory at kernel_addr_r.
-@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
+@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
  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.'
  
  # Upgrade part 2, use new ECC format for the whole device...
@@ -30,24 +30,20 @@ index 401c47a..8fa5af9 100644
  setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
  
  # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
- setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
- 
--echo 'enter "run update" to update the entire module'
-+echo 'enter "run update" to update the uboot'
 diff --git a/flash_eth.scr b/flash_eth.scr
-index 15aab1c..aa98b3a 100644
+index b0e4904..0a8e3cc 100644
 --- a/flash_eth.scr
 +++ b/flash_eth.scr
-@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${l
- setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
- setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write $
+ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${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_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
 +setenv update_new 'run update_uboot; reset'
  
  # Upgrade part 1, write new U-Boot, but with old ECC format still...
  # Store config block temporarly in memory at kernel_addr_r.
-@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
+@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
  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.'
  
  # Upgrade part 2, use new ECC format for the whole device...
@@ -56,7 +52,3 @@ index 15aab1c..aa98b3a 100644
  setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
  
  # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
- setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
- 
--echo 'enter "run update" to update the entire module'
-+echo 'enter "run update" to update the uboot'
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 5c75100..12d89cf 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
@@ -17,10 +17,10 @@ setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2
 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}'
 
 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}'
-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}'
+setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
 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'
 
-setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}'
+setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}'
 
 setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}'
 
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 16f91e8..ee91523 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
@@ -15,10 +15,10 @@ setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2
 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}'
 
 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}'
-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}'
+setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
 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'
 
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}'
+setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}'
 
 setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}'
 
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
index f6dc0cc..083ec6d 100644
--- 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
@@ -1,7 +1,7 @@
-From f86bb70bd270967082cb8132eb68c3c3dea4a7a7 Mon Sep 17 00:00:00 2001
+From 0f7d6eecead2c079ac050e6d16b64f280d9feab0 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 15 May 2017 15:31:36 +0300
-Subject: [PATCH 1/2] Make sdboot default on all boards
+Subject: [PATCH] Make sdboot default on all boards
 
 ... and remove console=tty1 from kernel args
 ---
@@ -12,10 +12,10 @@ Subject: [PATCH 1/2] Make sdboot default on all boards
  4 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 76cbdf2..9b42af9 100644
+index 71dfeb56f5..b687dab91d 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -257,7 +257,8 @@
+@@ -256,7 +256,8 @@
  #endif
  #define CONFIG_EXTRA_ENV_SETTINGS \
         BOOTENV \
@@ -25,20 +25,20 @@ index 76cbdf2..9b42af9 100644
                 "run distro_bootcmd ; " \
                 "usb start ;" \
                 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -280,7 +281,7 @@
+@@ -279,7 +280,7 @@
                 " ${loadaddr} flash_blk.img && " \
                 "source ${loadaddr}\0" \
         "setup=setenv setupargs fec_mac=${ethaddr} " \
 -               "consoleblank=0 no_console_suspend=1 console=tty1 " \
 +               "consoleblank=0 no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
+                "console=${console},${baudrate}n8\0" \
         "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
         "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index ab561f3..cbaeece 100644
+index f1fd5b422e..c7d75cea2a 100644
 --- a/include/configs/colibri_imx6.h
 +++ b/include/configs/colibri_imx6.h
-@@ -232,7 +232,8 @@
+@@ -231,7 +231,8 @@
  #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
  #define CONFIG_EXTRA_ENV_SETTINGS \
         BOOTENV \
@@ -48,17 +48,17 @@ index ab561f3..cbaeece 100644
                 "run distro_bootcmd ; " \
                 "usb start ;" \
                 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -253,7 +254,7 @@
+@@ -252,7 +253,7 @@
                 "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                 "source ${loadaddr}\0" \
         "setup=setenv setupargs fec_mac=${ethaddr} " \
 -               "consoleblank=0 no_console_suspend=1 console=tty1 " \
 +               "consoleblank=0 no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
+                "console=${console},${baudrate}n8\0" \
         "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
         "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index 2d6cee3..6773296 100644
+index ea04762b49..ca827a8a58 100644
 --- a/include/configs/colibri_imx7.h
 +++ b/include/configs/colibri_imx7.h
 @@ -104,7 +104,7 @@
@@ -80,7 +80,7 @@ index 2d6cee3..6773296 100644
         "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
         "setusbupdate=usb start && setenv interface usb && " \
 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index 7fea78b..5bc3e3d 100644
+index db610d53f1..aafd4bc95e 100644
 --- a/include/configs/colibri_vf.h
 +++ b/include/configs/colibri_vf.h
 @@ -155,7 +155,7 @@
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
index 469009b..ea94c0c 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
@@ -1,8 +1,7 @@
-From 138f477c5a1990429d35ffadc8f5cea5b1e9f945 Mon Sep 17 00:00:00 2001
+From 41be67109ab0c0fd156ee8615592827624fab12e Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 19 May 2017 12:41:38 +0300
-Subject: [PATCH 2/2] apalis-imx6: test for Capacitive Touch Display 7"
- Parallel
+Subject: [PATCH] apalis-imx6: test for Capacitive Touch Display 7" Parallel
 
 Test i2c bus if Capacitive Touch Display 7" Parallel display is present
 during boot. If found, enable it as the primary display in kernel args.
@@ -14,10 +13,10 @@ support for the atmel_mxt_ts touch controller.
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 9b42af9..121eaa7 100644
+index b687dab91d..3351a18e4c 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -250,7 +250,7 @@
+@@ -249,7 +249,7 @@
                 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
  
  #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
@@ -26,14 +25,14 @@ index 9b42af9..121eaa7 100644
  #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
  #else
  #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
-@@ -280,9 +280,14 @@
+@@ -279,9 +279,14 @@
                 "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \
                 " ${loadaddr} flash_blk.img && " \
                 "source ${loadaddr}\0" \
 -       "setup=setenv setupargs fec_mac=${ethaddr} " \
 +       "setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \
                 "consoleblank=0 no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
+                "console=${console},${baudrate}n8\0" \
 +       "setupvideo=i2c dev 0; if i2c probe 4A; " \
 +        "then setenv vidargs mxc_hdmi.only_cea=1 " \
 +               "video=mxcfb0:dev=lcd,FusionF07A,if=RGB24 " \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
index 1bf7c27..d2e82a7 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
@@ -1,7 +1,7 @@
-From 1f3926a8e90a7e582d28b845e812d0642a4dc5ce Mon Sep 17 00:00:00 2001
+From ccbaab75abc8d5f5cbadc6a0285dd496a45252cf Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 12 Oct 2017 11:02:54 +0300
-Subject: [PATCH 3/3] apalis-imx6: Ixora v1.0 support
+Subject: [PATCH] apalis-imx6: Ixora v1.0 support
 
 Add sddrive variable that can be changed to boot from different mmc card
 slot when using different versions of ixora carrier board.
@@ -11,10 +11,10 @@ Default to drive 1, which is correct for Ixora v1.1.
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 121eaa7..77a8874 100644
+index 3351a18e4c..7aabb1334b 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -227,15 +227,16 @@
+@@ -226,15 +226,16 @@
                 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
  
  #define SD_BOOTCMD \
@@ -29,7 +29,7 @@ index 121eaa7..77a8874 100644
 -               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
 +               "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \
                 "${boot_file} && run fdt_fixup && " \
-                "bootm ${kernel_addr_r} ${dtbparam}\0" \
+                "bootz ${kernel_addr_r} ${dtbparam}\0" \
 -       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 +       "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \
                 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
index c259f7f..acc5a16 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
@@ -1,22 +1,22 @@
-From 0b31b8e73bfbc02e7687ea521e9e92f892e7052a Mon Sep 17 00:00:00 2001
+From 6c83b14450862c63ebd755fdf81afde43cddfe6c Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 18 Oct 2017 13:20:25 +0300
-Subject: [PATCH 4/4] apalis-imx6: lower default resolution on HDMI to 720p
+Subject: [PATCH] apalis-imx6: lower default resolution on HDMI to 720p
 
 ---
  include/configs/apalis_imx6.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 77a8874..0292e74 100644
+index 7aabb1334b..da34817a7a 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -295,7 +295,7 @@
+@@ -294,7 +294,7 @@
                 "source ${loadaddr}\0" \
         "splashpos=m,m\0" \
         "vidargs=mxc_hdmi.only_cea=1 " \
 -               "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
 +               "video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \
                 "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
-                "fbmem=32M\0 "
+                "fbmem=32M\0"