diff options
| author | Simon Glass <sjg@chromium.org> | 2019-12-06 21:42:33 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2019-12-15 11:44:20 +0800 |
| commit | df81abda0e95b28a0eff201ac3faa375f061f367 (patch) | |
| tree | 91f02db1ca9d669e4239b4e7b5ab47ee8b1f254d /arch/x86/dts | |
| parent | 4f1f507298e152a97d2aef31c1cd7d9fdec1dafc (diff) | |
| download | u-boot-df81abda0e95b28a0eff201ac3faa375f061f367.zip u-boot-df81abda0e95b28a0eff201ac3faa375f061f367.tar.gz u-boot-df81abda0e95b28a0eff201ac3faa375f061f367.tar.bz2 | |
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>
Diffstat (limited to 'arch/x86/dts')
| -rw-r--r-- | arch/x86/dts/u-boot.dtsi | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index e0cca58..f0f8c71 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 = <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 { |