diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-29 12:10:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-29 12:10:55 -0400 |
| commit | 15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3 (patch) | |
| tree | a05518590771cfaff996f35856b9d9d8edfa7221 /doc | |
| parent | 38436abd5e58044eccddbcd7ec3610a9104e86b6 (diff) | |
| parent | 62b27a561c2868d95445905ad554297e43cc0f2b (diff) | |
| download | u-boot-15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3.tar.gz | |
Merge branch '2021-07-28-assorted-fixes'
- Assorted bugfixes
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/arch/sandbox.rst | 6 | ||||
| -rw-r--r-- | doc/build/gcc.rst | 6 | ||||
| -rw-r--r-- | doc/uImage.FIT/signature.txt | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index 9e23e1618c..f8804e1f41 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -43,11 +43,7 @@ Note that standalone/API support is not available at present. Prerequisites ------------- -Here are some packages that are worth installing if you are doing sandbox or -tools development in U-Boot: - - python3-pytest lzma lzma-alone lz4 python3 python3-virtualenv - libssl1.0-dev +Install the dependencies noted in :doc:`../build/gcc`. Basic Operation diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst index c51b3e73b8..8ffb4e3447 100644 --- a/doc/build/gcc.rst +++ b/doc/build/gcc.rst @@ -26,8 +26,10 @@ Depending on the build targets further packages maybe needed sudo apt-get install bc bison build-essential coccinelle \ device-tree-compiler dfu-util efitools flex gdisk liblz4-tool \ libguestfs-tools libncurses-dev libpython3-dev libsdl2-dev libssl-dev \ - lzma-alone openssl python3 python3-coverage python3-pyelftools \ - python3-pytest python3-sphinxcontrib.apidoc python3-sphinx-rtd-theme swig + lz4 lzma lzma-alone openssl python3 python3-coverage \ + python3-pycryptodome python3-pyelftools python3-pytest \ + python3-sphinxcontrib.apidoc python3-sphinx-rtd-theme python3-virtualenv \ + swig SUSE based ~~~~~~~~~~ diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt index 7cb1c15e5e..61a72db3c7 100644 --- a/doc/uImage.FIT/signature.txt +++ b/doc/uImage.FIT/signature.txt @@ -533,8 +533,8 @@ Generic engine key ids: or "<key-name-hint>" -As mkimage does not at this time support prompting for passwords HSM may need -key preloading wrapper to be used when invoking mkimage. +In order to set the pin in the HSM, an environment variable "MKIMAGE_SIGN_PIN" +can be specified. The following examples use the Nitrokey Pro using pkcs11 engine. Instructions for other devices may vary. |