summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-02-16 19:54:00 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-02-16 19:54:00 +0000
commit65f11a6585828a99357b8aa0edc50855998390b4 (patch)
tree04865d93ff93a1881da4985da38555a762425637 /packages/linux
parentc1c3aa4892bfe913d837781b4078a0f63def42b4 (diff)
parent81d60d223becf845ecc2a035648f9effd2437d0e (diff)
merge of '0bbc4414a3d984fe899446fe3d8f50b9238cc3dc'
and '98f85bb96baab42bb0d213a35c2cd9f1c06a3f47'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-handhelds-2.6.inc15
1 files changed, 11 insertions, 4 deletions
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 81af72e413..a0aec9cb36 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -88,20 +88,27 @@ set cmdline "root=/dev/mmcblk0p2 rootdelay=10 console=ttyS0,115200n8 console=tty
## 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