summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2015-05-03 19:55:10 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-05-15 07:01:42 +0200
commit74a96ab0077f7010cbec6c1f1182ce2ea4fabc6b (patch)
tree70724e928ef643978b7fa9ef6058090d2e8d07c4 /Documentation
parent041b2bd31fe1e6b77fb445da3bd3c2fcb5612ae3 (diff)
downloadbarebox-74a96ab0077f7010cbec6c1f1182ce2ea4fabc6b.tar.gz
barebox-74a96ab0077f7010cbec6c1f1182ce2ea4fabc6b.tar.xz
Documentation: booting linux: improve doc text
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user/booting-linux.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/user/booting-linux.rst b/Documentation/user/booting-linux.rst
index 5ef1254d46..ad32907215 100644
--- a/Documentation/user/booting-linux.rst
+++ b/Documentation/user/booting-linux.rst
@@ -55,12 +55,13 @@ to free the internal devicetree before calling ``bootm``
Passing Kernel Arguments
^^^^^^^^^^^^^^^^^^^^^^^^
-Depending on the barebox configuration (``CONFIG_FLEXIBLE_BOOTARGS``) there
-are to ways to pass bootargs to the Kernel. With ``CONFIG_FLEXIBLE_BOOTARGS``
-disabled the bootm command takes the bootargs from the ``bootargs`` environment
-variable. With ``CONFIG_FLEXIBLE_BOOTARGS`` enabled the bootargs are composed
-from different :ref:`global_device` variables. All variables beginning with
-``global.linux.bootargs.`` will be concatenated to the bootargs:
+The simple method to pass bootargs to the kernel is with
+``CONFIG_FLEXIBLE_BOOTARGS`` disabled: in this case the bootm command
+takes the bootargs from the ``bootargs`` environment variable.
+
+With ``CONFIG_FLEXIBLE_BOOTARGS`` enabled, the bootargs are composed
+from different :ref:`global device<global_device>` variables. All variables beginning
+with ``global.linux.bootargs.`` will be concatenated to the bootargs:
.. code-block:: sh