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>

diff --git a/tools/binman/README b/tools/binman/README
index 9d9d1832eeb7fdbad3d795686b03884cf47e14bb..10dfe5766d727242c858fa4bf8290ba67437b3d1 100644 (file)
--- 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 c6e7b226090e9f6232ffdb01db5f72700c183434..041e77771ed8356fcccc98c5fe086b213e6ff893 100644 (file)
--- 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 51e7ba48f597557d5a208942ae08eb6992627f48..c850b59a1e1fe98b38239d7a530c2d9f24b53734 100644 (file)
--- 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