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
|
From 4c748ee698961515c1602373f4f5d399c0a8e4a1 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 14 Sep 2016 17:10:22 +0300
Subject: [PATCH] Make sdboot default on all boards
---
include/configs/apalis_imx6.h | 13 +++++++------
include/configs/colibri_imx6.h | 3 ++-
include/configs/colibri_imx7.h | 2 +-
include/configs/colibri_vf.h | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 3ea4a5c..53d9a0c 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -252,14 +252,14 @@
"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define SD_BOOTCMD \
- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
- "rootwait\0" \
+ "drive=2\0" \
"sdboot=run setup; " \
- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
"${vidargs}; echo Booting from SD card in 8-bit slot...; " \
- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
"${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define USB_BOOTCMD \
@@ -279,7 +279,8 @@
#define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
+ "run emmcboot ; echo ; echo emmcboot failed ; " \
"run nfsboot ; echo ; echo nfsboot failed ; " \
"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 adc2d1e..9fd5f4c 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -245,7 +245,8 @@
#define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
+ "run emmcboot ; echo ; echo emmcboot failed ; " \
"run nfsboot ; echo ; echo nfsboot failed ; " \
"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 e585c81..f6267a7 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -226,7 +226,7 @@
"ubi read ${fdt_addr_r} dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 26cf60a..33a3e3b 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -185,7 +185,7 @@
"ubi read ${fdt_addr_r} dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
#define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
|
