path: root/doc
diff options
authorTom Rini <>2015-10-27 19:08:19 -0400
committerTom Rini <>2015-10-27 19:08:19 -0400
commit2431492aef1de33bd222c97ecc131a338d9c454e (patch)
tree4e57720bbefe998dbafcce6a1fb015baa936a73e /doc
parentc139b5ff0999ec3d44a02ebdb623a92e5782e53e (diff)
parent4ea5243a3a2fbc59bbcdd401d75f1744bcd6280f (diff)
Merge git://
Diffstat (limited to 'doc')
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/README.fdt-control b/doc/README.fdt-control
index e6d5ed0bb6..29fd56a815 100644
--- a/doc/README.fdt-control
+++ b/doc/README.fdt-control
@@ -156,7 +156,10 @@ address of the fdt binary blob, and will override either of the options.
Be aware that this environment variable is checked prior to relocation,
when only the compiled-in environment is available. Therefore it is not
possible to define this variable in the saved SPI/NAND flash
-environment, for example (it will be ignored).
+environment, for example (it will be ignored). After relocation, this
+variable will be set to the address of the newly relocated fdt blob.
+It is read-only and cannot be changed. It can optionally be used to
+control the boot process of Linux with bootm/bootz commands.
To use this, put something like this in your board header file:
diff --git a/doc/driver-model/usb-info.txt b/doc/driver-model/usb-info.txt
index 66f2daec7c..e07e5ba261 100644
--- a/doc/driver-model/usb-info.txt
+++ b/doc/driver-model/usb-info.txt
@@ -84,7 +84,7 @@ The following primary data structures are in use:
This holds information about a device on the bus. All devices have
this structure, even the root hub. The controller itself does not
have this structure. You can access it for a device 'dev' with
- dev_get_parentdata(dev). It matches the old structure except that the
+ dev_get_parent_priv(dev). It matches the old structure except that the
parent and child information is not present (since driver model
handles that). Once the device is set up, you can find the device
descriptor and current configuration descriptor in this structure.
@@ -279,7 +279,7 @@ USB hubs are scanned as in the section above. While hubs have their own
uclass, they share some common elements with controllers:
- they both attach private data to their children (struct usb_device,
-accessible for a child with dev_get_parentdata(child))
+accessible for a child with dev_get_parent_priv(child))
- they both use usb_child_pre_probe() to set up their children as proper USB
OpenPOWER on IntegriCloud