x86: Separate out U-Boot and device tree in ROM image

At present binman does not support updating a device tree that is part of
U-Boot (i.e u-boot.bin). Separate the entries into two so that we can get
updated entry information. This makes binman_entry_find() work correctly.

Do the same for SPL tool.

In both cases, group the two parts into a section so that SPL symbols get
the correct total size.

It may be possible for binman to handle this automatically at some point,
by ignoring u-boot.bin and always creating it from u-boot-nodtb.bin and
u-boot.dtb

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

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index e0cca5864008635b8c32f7398f3f672d4a87f4dc..f0f8c71761a7ddc79cd6a92a348c618d3701f5dd 100644 (file)
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -44,13 +44,21 @@
        u-boot-tpl-dtb {
        };
 #endif
-       u-boot-spl {
+       spl {
+               type = "section";
                offset = <CONFIG_X86_OFFSET_SPL>;
-       };
-       u-boot-spl-dtb {
+               u-boot-spl {
+               };
+               u-boot-spl-dtb {
+               };
        };
        u-boot {
+               type = "section";
                offset = <CONFIG_X86_OFFSET_U_BOOT>;
+               u-boot-nodtb {
+               };
+               u-boot-dtb {
+               };
        };
 #elif defined(CONFIG_SPL)
        u-boot-spl-with-ucode-ptr {