summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-07-22 20:48:51 -0400
committerTom Rini <trini@konsulko.com>2022-07-22 20:48:51 -0400
commit03662dc50627b3dc05a1c17f968bf26203f34666 (patch)
tree39512abd3af00a222bd26ea92dc36b1e4e549702 /doc
parentfd41c8f7a3b00ffcdcfab6d78b006a9e2a5c1873 (diff)
parent052e8ca421cc8697f8cf7de16253627c4c92f4dc (diff)
Merge tag 'efi-2022-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-10-rc1-2 Documentation: * doc: add package uuid-dev to build dependencies UEFI: * remove support for CONFIG_LCD * fix authenticated capsules tests Others: * pxe: simplify label_boot() * cli: support bracketed paste
Diffstat (limited to 'doc')
-rw-r--r--doc/build/gcc.rst2
-rw-r--r--doc/develop/codingstyle.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst
index 682051abeb..ee544ad87e 100644
--- a/doc/build/gcc.rst
+++ b/doc/build/gcc.rst
@@ -30,7 +30,7 @@ Depending on the build targets further packages maybe needed
pkg-config python3 python3-asteval python3-coverage \
python3-pkg-resources python3-pycryptodome python3-pyelftools \
python3-pytest python3-sphinxcontrib.apidoc python3-sphinx-rtd-theme \
- python3-subunit python3-testtools python3-virtualenv swig
+ python3-subunit python3-testtools python3-virtualenv swig uuid-dev
SUSE based
~~~~~~~~~~
diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst
index 2b13818a8c..a6bc37bbb4 100644
--- a/doc/develop/codingstyle.rst
+++ b/doc/develop/codingstyle.rst
@@ -41,7 +41,7 @@ The following rules apply:
* The exception here is Python which requires 4 spaces instead.
- * All source files need to be in "Unix" and not "DOS" or "Windows" formatted,
+ * All source files need to be in "Unix" and not "DOS" or "Windows" format,
with respect to line ends.
* Do not add more than 2 consecutive empty lines to source files