diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
commit | 2a17e75a976d11c1712972d29813094b8020ac35 (patch) | |
tree | ea0e991c927752937803d72a5411f7159365aa83 /Documentation | |
parent | a5f75fe8175aefec5b7cefaadc5359096c8eb22c (diff) | |
parent | 7185b353c96e1e831533eeaaada06ad9bebf84a2 (diff) | |
download | barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.gz barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/boards/imx/amazon-kindle-4-5.rst | 6 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/barebox/barebox,state.rst | 2 | ||||
-rw-r--r-- | Documentation/user/state.rst | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/boards/imx/amazon-kindle-4-5.rst b/Documentation/boards/imx/amazon-kindle-4-5.rst index 58f38a058e..26f072e28d 100644 --- a/Documentation/boards/imx/amazon-kindle-4-5.rst +++ b/Documentation/boards/imx/amazon-kindle-4-5.rst @@ -36,13 +36,15 @@ USB bootloader mode by the SoC microcode: 1. Connect the Kindle to your host computer with a USB cable. 2. Power down the device by holding the power button until the power LED goes dark (about 10 seconds). -4. Hold the power button, and hold down a device-specific special key: +3. Hold the power button, and hold down a device-specific special key: + * the fiveway down button on the model D01100 * the home button on model D01200 + 4. Then release the power button, but still hold the special key. 5. A new USB device named ``NS Blank CODEX`` should appear on your host computer. You can now release the special button. -7. Finally, upload barebox to the Kindle by using: +6. Finally, upload barebox to the Kindle by using: .. code-block:: console diff --git a/Documentation/devicetree/bindings/barebox/barebox,state.rst b/Documentation/devicetree/bindings/barebox/barebox,state.rst index 2893937820..390e148a28 100644 --- a/Documentation/devicetree/bindings/barebox/barebox,state.rst +++ b/Documentation/devicetree/bindings/barebox/barebox,state.rst @@ -52,7 +52,7 @@ Optional Properties ``circular`` or ``noncircular``. If the backend memory needs to be erased prior a write it defaults to the ``circular`` storage backend type, for backend memories like RAMs or EEPROMs it defaults to the ``direct`` storage backend type. -* ``algo``: A HMAC algorithm used to detect manipulation of the data +* ``algo``: An HMAC algorithm used to detect manipulation of the data or header, sensible values follow this pattern ``hmac(<HASH>)``, e.g. ``hmac(sha256)``. Only available for the ``backend-type`` ``raw``. * ``keep-previous-content``: Check if a the bucket meta magic field contains diff --git a/Documentation/user/state.rst b/Documentation/user/state.rst index 89129add77..07743df0cb 100644 --- a/Documentation/user/state.rst +++ b/Documentation/user/state.rst @@ -647,7 +647,6 @@ within the EEPROM. }; }; }; -}; With this 'backend' definition it's possible to define the *state* variable set content, its backend-type and *state* variable layout. |