diff options
| author | Tom Rini <[email protected]> | 2024-03-21 08:35:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-03-21 08:35:23 -0400 |
| commit | 5397daaed8994000f2b3480896df9c163dea4375 (patch) | |
| tree | 21671fe2a0f3ff4fbeda01be16060406004d93d5 /tools | |
| parent | 6ec096a7116a5f1f7dfac5f69ef192429331905c (diff) | |
| parent | fcd0c8b8474f7db0b94608424715a73fbeba92dc (diff) | |
Merge tag 'efi-2024-04-rc5-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-04-rc5-2
Documentation:
* patman: Properly document the patchwork_url setting
* doc: man-page for if
* colibri-imx8x, apalis-imx8: update board documentation
UEFI:
* correct handling of EFI binary return code
* don't show usage help if EFI binary fails.
* correct error handling for bootefi selftest command
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/patman/patman.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst index e01355824c5..f4588c00fc1 100644 --- a/tools/patman/patman.rst +++ b/tools/patman/patman.rst @@ -144,7 +144,7 @@ patman.py. For reference, the useful ones (at the moment) shown below process_tags: False verbose: True smtp_server: /path/to/sendmail - patchwork_server: https://patchwork.ozlabs.org + patchwork_url: https://patchwork.ozlabs.org If you want to adjust settings (or aliases) that affect just a single project you can add a section that looks like [project_settings] or @@ -248,9 +248,9 @@ Series-links: [id | version:id]... Series-patchwork-url: url This allows specifying the Patchwork URL for a branch. This overrides - both the setting files and the command-line argument. The URL should - include the protocol and web site, with no trailing slash, for example - 'https://patchwork.ozlabs.org/project' + both the setting files ("patchwork_url") and the command-line argument. + The URL should include the protocol and web site, with no trailing slash, + for example 'https://patchwork.ozlabs.org/project' Cover-letter: Sets the cover letter contents for the series. The first line |