| Message ID | 20190130035935.235565-39-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Add support for booting from TPL | expand |
On Wed, Jan 30, 2019 at 12:01 PM Simon Glass <sjg@chromium.org> wrote: > > 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> > --- > > arch/x86/dts/u-boot.dtsi | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > 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 70e9c8f7ac..5943619b86 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; @@ -108,6 +122,5 @@ offset = <CONFIG_SYS_X86_START16>; }; #endif - }; }; #endif
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> --- arch/x86/dts/u-boot.dtsi | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)