summaryrefslogtreecommitdiffstats
path: root/Documentation/frv/booting.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-08 08:20:26 +0200
committerDavid S. Miller <davem@davemloft.net>2011-08-08 08:20:26 +0200
commit19fd61785a580c60cba900c5171bfadb57dd5056 (patch)
tree1e491fb014be0dc03f4b6755bb94e73afd38c455 /Documentation/frv/booting.txt
parentnetxen: add vlan LRO support (diff)
parentdp83640: increase receive time stamp buffer size (diff)
downloadlinux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.xz
linux-19fd61785a580c60cba900c5171bfadb57dd5056.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
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