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
|
From 958064eb53b2636ad3c4194707ce789e0d95522b Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 5 Jan 2010 12:43:46 +0100
Subject: [PATCH] use rootwait instead of rootdelay
---
src/cpu/s3c2410/gta01.c | 6 +++---
src/cpu/s3c2442/gta02.c | 6 +++---
src/cpu/s3c6410/om_3d7k-steppingstone.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/cpu/s3c2410/gta01.c b/src/cpu/s3c2410/gta01.c
index 4686fa2..7ea74db 100644
--- a/src/cpu/s3c2410/gta01.c
+++ b/src/cpu/s3c2410/gta01.c
@@ -280,7 +280,7 @@ const struct board_api board_api_gta01 = {
.partition_index = 1,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA01.bin",
- .commandline_append = "root=/dev/mmcblk0p1 rootdelay=1 ",
+ .commandline_append = "root=/dev/mmcblk0p1 rootwait ",
},
[1] = {
.name = "SD Card EXT2 Kernel p2",
@@ -289,7 +289,7 @@ const struct board_api board_api_gta01 = {
.partition_index = 2,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA01.bin",
- .commandline_append = "root=/dev/mmcblk0p2 rootdelay=1 ",
+ .commandline_append = "root=/dev/mmcblk0p2 rootwait ",
},
[2] = {
.name = "SD Card EXT2 Kernel p3",
@@ -298,7 +298,7 @@ const struct board_api board_api_gta01 = {
.partition_index = 3,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA01.bin",
- .commandline_append = "root=/dev/mmcblk0p3 rootdelay=1 ",
+ .commandline_append = "root=/dev/mmcblk0p3 rootwait ",
},
[3] = {
.name = "NAND Kernel",
diff --git a/src/cpu/s3c2442/gta02.c b/src/cpu/s3c2442/gta02.c
index 13be2ac..32601f5 100644
--- a/src/cpu/s3c2442/gta02.c
+++ b/src/cpu/s3c2442/gta02.c
@@ -707,7 +707,7 @@ const struct board_api board_api_gta02 = {
.partition_index = 1,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA02.bin",
- .commandline_append = " root=/dev/mmcblk0p1 rootdelay=1 ",
+ .commandline_append = " root=/dev/mmcblk0p1 rootwait ",
},
[1] = {
.name = "SD Card EXT2 P2 Kernel",
@@ -716,7 +716,7 @@ const struct board_api board_api_gta02 = {
.partition_index = 2,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA02.bin",
- .commandline_append = " root=/dev/mmcblk0p2 rootdelay=1 ",
+ .commandline_append = " root=/dev/mmcblk0p2 rootwait ",
},
[2] = {
.name = "SD Card EXT2 P3 Kernel",
@@ -725,7 +725,7 @@ const struct board_api board_api_gta02 = {
.partition_index = 3,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA02.bin",
- .commandline_append = " root=/dev/mmcblk0p3 rootdelay=1 ",
+ .commandline_append = " root=/dev/mmcblk0p3 rootwait ",
},
[3] = {
.name = "NAND Kernel",
diff --git a/src/cpu/s3c6410/om_3d7k-steppingstone.c b/src/cpu/s3c6410/om_3d7k-steppingstone.c
index 71c57f9..1944e36 100644
--- a/src/cpu/s3c6410/om_3d7k-steppingstone.c
+++ b/src/cpu/s3c6410/om_3d7k-steppingstone.c
@@ -89,7 +89,7 @@ const struct board_api board_api_om_3d7k = {
"console=ttySAC3,115200 "
"init=/sbin/init "
"loglevel=8 "
- "rootdelay=1 no_console_suspend "
+ "rootwait no_console_suspend "
"ro ",
.commandline_board_debug = " loglevel=8",
.kernel_source = {
--
1.7.1
|
