diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
| commit | 57c475b48dcf8e41ddaaa77686ea41adb9049dc5 (patch) | |
| tree | a1079bd20b46b267991c96b3ceb9cd33ef5d60f9 /Documentation | |
| parent | d1ca07111d6214c232b8f419f0daa98c6e0835f6 (diff) | |
| parent | 526dddf4c3493a7b7732d9bd0aab2d3e22b3154a (diff) | |
| download | barebox-57c475b48dcf8e41ddaaa77686ea41adb9049dc5.tar.gz barebox-57c475b48dcf8e41ddaaa77686ea41adb9049dc5.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/boards/imx.rst | 2 | ||||
| -rw-r--r-- | Documentation/user/defaultenv-2.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/boards/imx.rst b/Documentation/boards/imx.rst index 1965135204..b3002badf1 100644 --- a/Documentation/boards/imx.rst +++ b/Documentation/boards/imx.rst @@ -7,7 +7,7 @@ SoCs up to i.MX31 support only the external Boot Mode. Newer SoCs can be configured for internal or external Boot Mode with the internal boot mode being the more popular mode. The i.MX23 and i.MX28, also known as i.MXs, are special. These SoCs have a completely different -boot mechanism. +boot mechanism, see :doc:`mxs` instead. Internal Boot Mode ------------------ diff --git a/Documentation/user/defaultenv-2.rst b/Documentation/user/defaultenv-2.rst index db74176b03..7502d3de10 100644 --- a/Documentation/user/defaultenv-2.rst +++ b/Documentation/user/defaultenv-2.rst @@ -93,6 +93,9 @@ the :ref:`command_edit` command. Typical content: # timeout in seconds before the default boot entry is started #global.autoboot_timeout=3 + # key to abort autoboot. Supported options are: "any" and "ctrl-c" + #global.autoboot_abort_key=any + # list of boot entries. These are executed in order until one # succeeds. An entry can be: # - a filename in /env/boot/ |