diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-05-07 13:03:42 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-05-07 13:03:42 +0200 |
| commit | 3132f623386e9ac87077bd839e726f7b940fbc94 (patch) | |
| tree | e868da1c9bf286d5375337978eab267cc7a535a8 /Documentation | |
| parent | of/base: release the node correctly in of_parse_phandle_with_args() (diff) | |
| parent | Documentation/devicetree: make semantic of initrd-end more explicit (diff) | |
| download | linux-3132f623386e9ac87077bd839e726f7b940fbc94.tar.xz linux-3132f623386e9ac87077bd839e726f7b940fbc94.zip | |
Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/usage-model.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/devicetree/usage-model.txt b/Documentation/devicetree/usage-model.txt index ef9d06c9f8fd..0efedaad5165 100644 --- a/Documentation/devicetree/usage-model.txt +++ b/Documentation/devicetree/usage-model.txt @@ -191,9 +191,11 @@ Linux it will look something like this: }; The bootargs property contains the kernel arguments, and the initrd-* -properties define the address and size of an initrd blob. The -chosen node may also optionally contain an arbitrary number of -additional properties for platform-specific configuration data. +properties define the address and size of an initrd blob. Note that +initrd-end is the first address after the initrd image, so this doesn't +match the usual semantic of struct resource. The chosen node may also +optionally contain an arbitrary number of additional properties for +platform-specific configuration data. During early boot, the architecture setup code calls of_scan_flat_dt() several times with different helper callbacks to parse device tree |