summaryrefslogtreecommitdiff
path: root/Documentation/frv/booting.txt
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-09-19 18:46:07 +0400
committerPekka Enberg <penberg@kernel.org>2011-09-19 18:46:07 +0400
commitd20bbfab01802e195a50435940f7e4aa747c217c (patch)
tree82b0007e33c083050a4e60a49dbb2f5477b4c99d /Documentation/frv/booting.txt
parenta37933c37c14b64e81c7c9cc44a5d3f5e0c91412 (diff)
parent136333d104bd3a62d783b0ac3d0f32ac0108c5d0 (diff)
downloadlinux-d20bbfab01802e195a50435940f7e4aa747c217c.tar.xz
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'Documentation/frv/booting.txt')
-rw-r--r--Documentation/frv/booting.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/frv/booting.txt b/Documentation/frv/booting.txt
index ace200b7c214..37c4d84a0e57 100644
--- a/Documentation/frv/booting.txt
+++ b/Documentation/frv/booting.txt
@@ -106,13 +106,20 @@ separated by spaces:
To use the first on-chip serial port at baud rate 115200, no parity, 8
bits, and no flow control.
- (*) root=/dev/<xxxx>
+ (*) root=<xxxx>
- This specifies the device upon which the root filesystem resides. For
- example:
+ This specifies the device upon which the root filesystem resides. It
+ may be specified by major and minor number, device path, or even
+ partition uuid, if supported. For example:
/dev/nfs NFS root filesystem
/dev/mtdblock3 Fourth RedBoot partition on the System Flash
+ PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF/PARTNROFF=1
+ first partition after the partition with the given UUID
+ 253:0 Device with major 253 and minor 0
+
+ Authoritative information can be found in
+ "Documentation/kernel-parameters.txt".
(*) rw