From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 18 Jan 2017 11:33:00 +0000 (-0800)
Subject: tools: binman: Handle optional microcode case in SPL image
X-Git-Tag: v2017.03-rc2~43
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d1adf04845a1509a27f182acf2b1c7fdb60439c;p=oweals%2Fu-boot.git

tools: binman: Handle optional microcode case in SPL image

On platforms which do not require microcode in SPL, handle such
case like U-Boot proper.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/binman/etype/u_boot_ucode.py b/tools/binman/etype/u_boot_ucode.py
index 8fe27acb24..8e51e99a11 100644
--- a/tools/binman/etype/u_boot_ucode.py
+++ b/tools/binman/etype/u_boot_ucode.py
@@ -62,6 +62,12 @@ class Entry_u_boot_ucode(Entry_blob):
             self.data = ''
             return True
 
+        # Handle microcode in SPL image as well
+        ucode_dest_entry = self.image.FindEntryType('u-boot-spl-with-ucode-ptr')
+        if ucode_dest_entry and not ucode_dest_entry.target_pos:
+            self.data = ''
+            return True
+
         # Get the microcode from the device tree entry
         fdt_entry = self.image.FindEntryType('u-boot-dtb-with-ucode')
         if not fdt_entry or not fdt_entry.ucode_data: