From df81abda0e95b28a0eff201ac3faa375f061f367 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 6 Dec 2019 21:42:33 -0700 Subject: [PATCH] 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 Reviewed-by: Bin Meng --- arch/x86/dts/u-boot.dtsi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index e0cca58640..f0f8c71761 100644 --- 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 = ; - }; - u-boot-spl-dtb { + u-boot-spl { + }; + u-boot-spl-dtb { + }; }; u-boot { + type = "section"; offset = ; + u-boot-nodtb { + }; + u-boot-dtb { + }; }; #elif defined(CONFIG_SPL) u-boot-spl-with-ucode-ptr { -- 2.39.5