summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2018-09-14 04:57:07 -0600
committerSimon Glass <sjg@chromium.org>2018-09-28 11:09:01 -0600
commitf069303852bdfa1303cd5787667bd7924f0482d9 (patch)
tree78b8e69b89d1cd70793259b95e443b405bb5c752
parent34967c2618439ef80cc76b4c43c3da4f66f12ffe (diff)
downloadu-boot-f069303852bdfa1303cd5787667bd7924f0482d9.tar.gz
binman: Move 'special properties' docs to README.entries
This information should be in the entry it relates to, not in the main README. Move it. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--tools/binman/README11
-rw-r--r--tools/binman/README.entries5
-rw-r--r--tools/binman/etype/u_boot_with_ucode_ptr.py3
3 files changed, 7 insertions, 12 deletions
diff --git a/tools/binman/README b/tools/binman/README
index 9d9d1832ee..10dfe5766d 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -462,17 +462,6 @@ see README.entries. This is generated from the source code using:
binman -E >tools/binman/README.entries
-Special properties
-------------------
-
-Some entries support special properties, documented here:
-
-u-boot-with-ucode-ptr:
- optional-ucode: boolean property to make microcode optional. If the
- u-boot.bin image does not include microcode, no error will
- be generated.
-
-
Order of image creation
-----------------------
diff --git a/tools/binman/README.entries b/tools/binman/README.entries
index c6e7b22609..041e77771e 100644
--- a/tools/binman/README.entries
+++ b/tools/binman/README.entries
@@ -524,6 +524,9 @@ Entry: u-boot-with-ucode-ptr: U-Boot with embedded microcode pointer
Properties / Entry arguments:
- filename: Filename of u-boot-nodtb.dtb (default 'u-boot-nodtb.dtb')
+ - optional-ucode: boolean property to make microcode optional. If the
+ u-boot.bin image does not include microcode, no error will
+ be generated.
See Entry_u_boot_ucode for full details of the three entries involved in
this process. This entry updates U-Boot with the offset and size of the
@@ -543,7 +546,7 @@ Properties / Entry arguments:
- kernelkey: Name of the kernel key to use (inside keydir)
- preamble-flags: Value of the vboot preamble flags (typically 0)
-Chromium OS signs the read-write firmware and kernel, writing the signature
+Chromium OS signs the read-write firmware and kernel, writing the signature
in this block. This allows U-Boot to verify that the next firmware stage
and kernel are genuine.
diff --git a/tools/binman/etype/u_boot_with_ucode_ptr.py b/tools/binman/etype/u_boot_with_ucode_ptr.py
index 51e7ba48f5..c850b59a1e 100644
--- a/tools/binman/etype/u_boot_with_ucode_ptr.py
+++ b/tools/binman/etype/u_boot_with_ucode_ptr.py
@@ -19,6 +19,9 @@ class Entry_u_boot_with_ucode_ptr(Entry_blob):
Properties / Entry arguments:
- filename: Filename of u-boot-nodtb.dtb (default 'u-boot-nodtb.dtb')
+ - optional-ucode: boolean property to make microcode optional. If the
+ u-boot.bin image does not include microcode, no error will
+ be generated.
See Entry_u_boot_ucode for full details of the three entries involved in
this process. This entry updates U-Boot with the offset and size of the