From 658cc049e046b15a4ffe074aaee182dc9415761a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Jun 2010 00:41:41 +0200 Subject: qi: use rootwait instead of rootdelay=1 Signed-off-by: Martin Jansa --- .../0001-use-rootwait-instead-of-rootdelay.patch | 89 ++++++++++++++++++++++ recipes/qi/qi_git.bb | 3 +- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch (limited to 'recipes') diff --git a/recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch b/recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch new file mode 100644 index 0000000000..f1f1e64a26 --- /dev/null +++ b/recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch @@ -0,0 +1,89 @@ +From 958064eb53b2636ad3c4194707ce789e0d95522b Mon Sep 17 00:00:00 2001 +From: Martin Jansa +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 + diff --git a/recipes/qi/qi_git.bb b/recipes/qi/qi_git.bb index 6a19292a70..37733a85e8 100644 --- a/recipes/qi/qi_git.bb +++ b/recipes/qi/qi_git.bb @@ -1,11 +1,12 @@ require qi.inc -PR = "r1" +PR = "r2" PR_append = "+gitr${SRCPV}" SRCREV = "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" SRC_URI = "\ git://git.openmoko.org/git/qi.git;protocol=git;branch=master \ file://sanitize-makefile.patch \ + file://0001-use-rootwait-instead-of-rootdelay.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg