1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From 1abe757120dd19518fd09d2013f518fba46c4d06 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/colibri_imx7.h | 2 +-
include/configs/colibri_vf.h | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 71dfeb56f5..8dcb5cc5e4 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -256,7 +256,8 @@
#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
--- 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" \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ea04762b49..47e8bd266d 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" \
-#define CONFIG_BOOTCOMMAND "run ubiboot; " \
+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
#define BOOTENV_RUN_NET_USB_START ""
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index db610d53f1..a2c942cafe 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -155,7 +155,7 @@
"ubi read ${fdt_addr_r} dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-#define CONFIG_BOOTCOMMAND "run ubiboot; " \
+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
#define BOOTENV_RUN_NET_USB_START ""
|
