diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-05-07 07:03:42 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-05-07 07:03:42 -0400 |
| commit | 3132f623386e9ac87077bd839e726f7b940fbc94 (patch) | |
| tree | e868da1c9bf286d5375337978eab267cc7a535a8 /Documentation | |
| parent | b855f16b05a697ac1863adabe99bfba56e6d3199 (diff) | |
| parent | a2b9ea73967386ec5e524ab206bd549d5aafea17 (diff) | |
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: | |||
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | The bootargs property contains the kernel arguments, and the initrd-* | 193 | The bootargs property contains the kernel arguments, and the initrd-* |
| 194 | properties define the address and size of an initrd blob. The | 194 | properties define the address and size of an initrd blob. Note that |
| 195 | chosen node may also optionally contain an arbitrary number of | 195 | initrd-end is the first address after the initrd image, so this doesn't |
| 196 | additional properties for platform-specific configuration data. | 196 | match the usual semantic of struct resource. The chosen node may also |
| 197 | optionally contain an arbitrary number of additional properties for | ||
| 198 | platform-specific configuration data. | ||
| 197 | 199 | ||
| 198 | During early boot, the architecture setup code calls of_scan_flat_dt() | 200 | During early boot, the architecture setup code calls of_scan_flat_dt() |
| 199 | several times with different helper callbacks to parse device tree | 201 | several times with different helper callbacks to parse device tree |