commit a0be411871f2e71834a2cd75dea882d732557530
author The Android Open Source Project <initial-contribution@android.com> Mon May 10 11:15:05 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon May 10 11:15:05 2010 -0700
tree 09112c43064342531c2d68cc88af1a63c2e35d79
parent 121d6447b523906e9ce57482b1d204df790d3557
parent 7828874761ce3ce2a382f6c1745bf3975527cd7b

merge from open-source master

Change-Id: I8fa5fe12f60d0de2a0f6e0f9c567104253bcbea3

stage2/preset_menu.c

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"
+    "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 recovery\n"
-    "cmdline (hd0,1)/cmdline\n"
-    "kernel --use-cmd-line (hd0,1)/kernel\n"
-    "initrd (hd0,1)/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";