1 files changed, 37 insertions, 33 deletions

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 2e5382f..df1429b 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,59 +1,63 @@
-From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001
+From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 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] Make sdboot default on all boards
 
 ... and remove console=tty1 from kernel args
 ---
- include/configs/apalis_imx6.h  | 3 ++-
- include/configs/colibri_imx6.h | 3 ++-
+ include/configs/apalis_imx6.h  | 5 +++--
+ include/configs/colibri_imx6.h | 5 +++--
  include/configs/colibri_imx7.h | 2 +-
  include/configs/colibri_vf.h   | 2 +-
- 4 files changed, 6 insertions(+), 4 deletions(-)
+ 4 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 71dfeb56f5..8dcb5cc5e4 100644
+index fa40c629c3..ad0284de8a 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -256,7 +256,8 @@
+@@ -177,8 +177,9 @@
+ #ifdef CONFIG_TDX_EASY_INSTALLER
+ #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
+ #else
+-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
+-               "run distro_bootcmd; usb start; " \
++#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
++               "run emmcboot; echo; echo emmcboot failed; " \
++                "run distro_bootcmd; usb start; " \
+                "setenv stdout serial,vga; setenv stdin serial,usbkbd"
  #endif
- #define CONFIG_EXTRA_ENV_SETTINGS \
-        BOOTENV \
--       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+        "run emmcboot ; echo ; echo emmcboot failed ; " \
-                "run distro_bootcmd ; " \
-                "usb start ;" \
-                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+ 
 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index f1fd5b422e..ae0f3c9bfa 100644
+index fda171bd9e..df49efc9ef 100644
 --- a/include/configs/colibri_imx6.h
 +++ b/include/configs/colibri_imx6.h
-@@ -231,7 +231,8 @@
- #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
- #define CONFIG_EXTRA_ENV_SETTINGS \
-        BOOTENV \
--       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+        "run emmcboot ; echo ; echo emmcboot failed ; " \
-                "run distro_bootcmd ; " \
-                "usb start ;" \
-                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+@@ -157,8 +157,9 @@
+ #ifdef CONFIG_TDX_EASY_INSTALLER
+ #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
+ #else
+-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
+-               "run distro_bootcmd; usb start; " \
++#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
++                "run emmcboot ; echo ; echo emmcboot failed ; " \
++                "run distro_bootcmd; usb start; " \
+                "setenv stdout serial,vga; setenv stdin serial,usbkbd"
+ #endif
+ 
 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index ea04762b49..47e8bd266d 100644
+index 6c91951878..4200512fea 100644
 --- a/include/configs/colibri_imx7.h
 +++ b/include/configs/colibri_imx7.h
-@@ -104,7 +104,7 @@
-                "ubi read ${fdt_addr_r} dtb && " \
-                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
- 
+@@ -128,7 +128,7 @@
+ #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \
+        "run bootcmd_mmc0; run ubiboot; run distro_bootcmd"
+ #else
 -#define CONFIG_BOOTCOMMAND "run ubiboot; " \
 +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
-        "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
+        "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
+ #endif
  
- #define BOOTENV_RUN_NET_USB_START ""
 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index db610d53f1..a2c942cafe 100644
+index 0579bfdc4e..65a5dada5f 100644
 --- a/include/configs/colibri_vf.h
 +++ b/include/configs/colibri_vf.h
 @@ -155,7 +155,7 @@