diff options
| author | Simon Glass <sjg@chromium.org> | 2019-05-02 10:52:20 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2019-05-08 13:02:17 +0800 |
| commit | c5edefb7f7e555ee691b44e12e1565c5aa45dc38 (patch) | |
| tree | ab42457a389f6d018c57ef81429c72b1b6424738 /arch/x86 | |
| parent | 93c76075802dba9bed40d20cfe1e4351c7bed4e5 (diff) | |
x86: Update device tree for Chromium OS verified boot
The standard image generated by U-Boot on x86 is u-boot.rom. Add a
separate image called image.bin for verified boot. This supports
verification in TPL of which SPL/U-Boot to start, then jumping to the
correct one, with SPL setting up the SDRAM and U-Boot proper providing
the user interface if needed.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/dts/u-boot.dtsi | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 9cf733806a..6b176339ae 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -6,9 +6,23 @@ #include <config.h> -#ifdef CONFIG_ROM_SIZE +#ifdef CONFIG_CHROMEOS / { binman { + multiple-images; + rom: rom { + }; + }; +}; +#else +/ { + rom: binman { + }; +}; +#endif + +#ifdef CONFIG_ROM_SIZE +&rom { filename = "u-boot.rom"; end-at-4gb; sort-by-offset; @@ -116,6 +130,5 @@ offset = <CONFIG_SYS_X86_START16>; }; #endif - }; }; #endif |