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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From f86bb70bd270967082cb8132eb68c3c3dea4a7a7 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
... and remove console=tty1 from kernel args
---
include/configs/apalis_imx6.h | 5 +++--
include/configs/colibri_imx6.h | 5 +++--
include/configs/colibri_imx7.h | 4 ++--
include/configs/colibri_vf.h | 4 ++--
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
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -257,7 +257,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" \
@@ -280,7 +281,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 " \
"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
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -232,7 +232,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" \
@@ -253,7 +254,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 " \
"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
--- 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 ""
@@ -138,7 +138,7 @@
"fatload ${interface} 0:1 ${loadaddr} " \
"${board}/flash_blk.img && source ${loadaddr}\0" \
"setup=setenv setupargs " \
- "console=tty1 console=${console}" \
+ "console=${console}" \
",${baudrate}n8 ${memargs} consoleblank=0\0" \
"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
--- 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 ""
@@ -190,7 +190,7 @@
"fatload ${interface} 0:1 ${loadaddr} " \
"${board}/flash_blk.img && source ${loadaddr}\0" \
"setup=setenv setupargs " \
- "console=tty1 console=${console}" \
+ "console=${console}" \
",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
"setusbupdate=usb start && setenv interface usb && " \
|
