merge from open-source masterandroid-sdk-tools_r7android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r1android-adt-0.9.9android-adt-0.9.8android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1tools_r9tools_r8tools_r7gingerbread-releasegingerbread-mr4-releasefroyo-plus-aosp

Change-Id: I8fa5fe12f60d0de2a0f6e0f9c567104253bcbea3

1 files changed, 10 insertions, 17 deletions

diff --git a/stage2/preset_menu.c b/stage2/preset_menu.c
index f024174..e968049 100644
--- a/stage2/preset_menu.c
+++ b/stage2/preset_menu.c
@@ -1,22 +1,15 @@
 const char *preset_menu =
-    "serial --unit=0 --speed=115200\n"
-    "terminal --timeout=0 --dumb console\n"
     "rootnoverify (hd0,0)\n"
-    "default 2\n"
-    "fallback 1 0\n"
+    "default=1\n"
     "timeout 3\n"
+    "fallback 1 0\n"
     "\n"
-    "title sysloader\n"
-    "cmdline (hd0,0)/cmdline\n"
-    "kernel --use-cmd-line (hd0,0)/kernel\n"
-    "initrd (hd0,0)/ramdisk\n"
-    "\n"
-    "title recovery\n"
-    "cmdline (hd0,1)/cmdline\n"
-    "kernel --use-cmd-line (hd0,1)/kernel\n"
-    "initrd (hd0,1)/ramdisk\n"
+    "title Android Install to /dev/sda from /dev/sdb\n"
+    "       cmdline (hd1,0)/cmdline\n"
+    "       kernel --use-cmd-line (hd1,0)/kernel\n"
+    "       initrd (hd1,0)/ramdisk\n"
     "\n"
-    "title std_boot\n"
-    "cmdline (hd0,2)/cmdline\n"
-    "kernel --use-cmd-line (hd0,2)/kernel\n"
-    "initrd (hd0,2)/ramdisk\n";
+    "title Android Startup from /dev/sda\n"
+    "       cmdline (hd0,2)/cmdline\n"
+    "       kernel --use-cmd-line (hd0,2)/kernel\n"
+    "       initrd (hd0,2)/ramdisk\n";