summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-06-11 22:31:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-06-11 22:36:58 +0200
commit3fc9db5d2aa58e057e28f86a195077afd9e2bcf4 (patch)
treec158b522f6aa4d57146e73bf8741d320aa9933fa /Documentation
parentc39c70bac5207b27235e98abbc78e135ce4a1126 (diff)
downloadbarebox-3fc9db5d2aa58e057e28f86a195077afd9e2bcf4.tar.gz
barebox-3fc9db5d2aa58e057e28f86a195077afd9e2bcf4.tar.xz
Documentation: explain new way to boot using ATAGs
oftree -f is gone and now global.bootm.boot_atag must be set to true if boot using ATAGs is desired. Update the documentation accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user/booting-linux.rst4
-rw-r--r--Documentation/user/devicetree.rst16
2 files changed, 6 insertions, 14 deletions
diff --git a/Documentation/user/booting-linux.rst b/Documentation/user/booting-linux.rst
index 408f87d8e8..437f4e80ca 100644
--- a/Documentation/user/booting-linux.rst
+++ b/Documentation/user/booting-linux.rst
@@ -49,8 +49,8 @@ variable:
bootm
**NOTE:** it may happen that barebox is probed from the devicetree, but you have
-want to start a Kernel without passing a devicetree. In this case call ``oftree -f``
-to free the internal devicetree before calling ``bootm``
+want to start a Kernel without passing a devicetree. In this case set the
+``global.bootm.boot_atag`` variable to ``true``.
Passing Kernel Arguments
^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Documentation/user/devicetree.rst b/Documentation/user/devicetree.rst
index 17934d86e3..679cae7f00 100644
--- a/Documentation/user/devicetree.rst
+++ b/Documentation/user/devicetree.rst
@@ -71,15 +71,7 @@ work on the internal devicetree. It is possible to add/remove nodes using the
# add a property to it
of_property -s /chosen/mynode/ myproperty myvalue
-It is important to know that these commands always work on the internal
-devicetree. If you modify the internal devicetree to influence the behaviour of
-a kernel booted later, make sure that you start the kernel with the internal
-devicetree (i.e. don't pass a devicetree to the :ref:`command_bootm` command). If you
-wish to use another devicetree than the internal devicetree for starting the kernel,
-you can exchange the internal devicetree during runtime using the
-:ref:`command_oftree` command:
-
-.. code-block:: sh
-
- oftree -f
- oftree -l /new/dtb
+It is important to know that these commands normally work on the internal
+devicetree. If you want to modify the devicetree the kernel is started with
+see the -f options to of_property and of_node. This option will register the
+operation for later execution on the Kernel devicetree.