[oe-commits] org.oe.angstrom-2007.12-stable applied changes from 1821f6eadefc14ad7ce51d5ab026da139608f557

[pfalcon commit]

applied changes from 1821f6eadefc14ad7ce51d5ab026da139608f557
             through 98f85bb96baab42bb0d213a35c2cd9f1c06a3f47

linux-handhelds-2.6: More elaboration to HaRET's sample startup.txt. (PaulS, Koen)

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 63973bab7244dcde20efb1b9e3afbaed22009172
ViewMTN: http://monotone.openembedded.org/revision/info/63973bab7244dcde20efb1b9e3afbaed22009172
Files:
1
packages/linux/linux-handhelds-2.6.inc
Diffs:

#
# mt diff -rf089a35f687cbf8bc0a42317699c7cf8613d36a1 -r63973bab7244dcde20efb1b9e3afbaed22009172
#
# 
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [2a754a7d66cf1dec3b59ed67417eeb6af7e654a2]
#    to [a212a1e08710b140bd482d9538939be6fed39bab]
# 
============================================================
--- packages/linux/linux-handhelds-2.6.inc	2a754a7d66cf1dec3b59ed67417eeb6af7e654a2
+++ packages/linux/linux-handhelds-2.6.inc	a212a1e08710b140bd482d9538939be6fed39bab
@@ -88,20 +88,27 @@ set cmdline "root=/dev/mmcblk0p2 rootdel
 ## Choice 2 - Boot from CF card, setup like above
 #set cmdline "root=/dev/hda2 rootdelay=10 console=ttyS0,115200n8 console=tty0"
 
-## Choice 3 - Boot rootfs image as initramfs (works only for smaller images)
+## Choice 3 - Boot kernel with builtin interactive bootloader (initramfs-bootmenu-image)
+# rootdelay is a wait before scanning for the available partitions
+# if root= is also specified, interactive selection will be skipped and
+# direct boot will happen.
+#set cmdline "rootdelay=3 console=ttyS0,115200n8 console=tty0"
+
+## Choice 4 - Boot rootfs image as initramfs (works only for smaller images)
 # have a cpio.gz file below together with zImage, no EXT2 partition required
 #set initrd "<image>.rootfs.cpio.gz"
 #set cmdline "rdinit=/sbin/init console=ttyS0,115200n8 console=tty0"
 
-## Choice 4 - Boot via NFS over USB networking (must be kernel-builtin)
+## Choice 5 - Boot via NFS over USB networking (must be kernel-builtin
+# or initramfs-*-image works too)
 # 192.168.x.x - Server address (the other side)
 # 192.168.y.y - Handheld's address
 #set cmdline "root=/dev/nfs nfsroot=192.168.x.x:<nfs_path> ip=192.168.y.y:192.168.x.x:192.168.x.x:255.255.255.0:pda:usb0 console=ttyS0,115200n8 console=tty0"
 
-## Choice 5 - Boot from MTD partition, for devices with lots of flash
+## Choice 6 - Boot from MTD partition, for devices with lots of flash
 #  to have both WinCE and Linux there. Note the value of root param,
 #  that's how it should be, not "/dev/mtdblockN".
-# set cmdline "root=mtdN console=ttyS0,115200n8 console=tty0"
+#set cmdline "root=mtdN console=ttyS0,115200n8 console=tty0"
 
 bootlinux
 EOF