diff mbox series

[U-Boot,v3,072/108] x86: Separate out U-Boot and device tree in ROM image

Message ID 20191021033913.220758-67-sjg@chromium.org
State Superseded
Delegated to: Bin Meng
Headers show
Series x86: Add initial support for apollolake | expand

Commit Message

Simon Glass Oct. 21, 2019, 3:38 a.m. UTC 
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.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v3: None
Changes in v2: None

 arch/x86/dts/u-boot.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Bin Meng Nov. 19, 2019, 1:33 p.m. UTC | #1 
On Mon, Oct 21, 2019 at 11:40 AM Simon Glass <sjg@chromium.org> wrote:
>
> 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.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
>  arch/x86/dts/u-boot.dtsi | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff mbox series

Patch

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index bb61b6e8af1..0f3690e8188 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -49,9 +49,11 @@ 
 	};
 	u-boot-spl-dtb {
 	};
-	u-boot {
+	u-boot-nodtb {
 		offset = <CONFIG_X86_OFFSET_U_BOOT>;
 	};
+	u-boot-dtb {
+	};
 #elif defined(CONFIG_SPL)
 	u-boot-spl-with-ucode-ptr {
 		offset = <CONFIG_X86_OFFSET_SPL>;