From 74a96ab0077f7010cbec6c1f1182ce2ea4fabc6b Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Sun, 3 May 2015 19:55:10 +0200 Subject: Documentation: booting linux: improve doc text Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer --- Documentation/user/booting-linux.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Documentation/user') 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` variables. All variables beginning +with ``global.linux.bootargs.`` will be concatenated to the bootargs: .. code-block:: sh -- cgit v1.2.3