Add support for booting EFI FIT images
cover Add support for booting EFI FIT images
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type - IH_OS_EFI - which can be created by using 'os = "efi"' inside an ITS file:
/ {
#address-cells = <1>;
images {
efi-grub {
description = "GRUB EFI";
data = /incbin/("EFI/BOOT/bootarm.efi");
type = "kernel_noload";
arch = "arm";
os = "efi";
compression = "none";
load = <0x0>;
entry = <0x0>;
hash-1 {
algo = "sha256";
};
};
};
configurations {
default = "config-grub";
config-grub {
kernel = "efi-grub";
signature-1 {
algo = "sha256,rsa2048";
sign-images = "kernel";
};
};
};
};The bootm command has been extended to handle the IH_OS_EFI images. To enable this feature, a new configuration option has been added:BOOTM_EFI
I tested the solution using the 'qemu_arm' board:
=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grub
Cristian Ciocaltea (2):
image: Add IH_OS_EFI for EFI chain-load boot
bootm: Add a bootm command for type IH_OS_EFI
cmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ common/image-fit.c | 3 ++- common/image.c | 1 + include/bootm.h | 2 ++ include/image.h | 1 + 7 files changed, 59 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 image: Add IH_OS_EFI for EFI chain-load boot
Add a new OS type to be used for chain-loading an EFI compatible firmware or boot loader like GRUB2, possibly in a verified boot scenario.
Bellow is sample ITS file that generates a FIT image supporting secure boot. Please note the presence of 'os = "efi";' line, which identifies the currently introduced OS type:
/ {
#address-cells = <1>;
images {
efi-grub {
description = "GRUB EFI";
data = /incbin/("EFI/BOOT/bootarm.efi");
type = "kernel_noload";
arch = "arm";
os = "efi";
compression = "none";
load = <0x0>;
entry = <0x0>;
hash-1 {
algo = "sha256";
};
};
};
configurations {
default = "config-grub";
config-grub {
kernel = "efi-grub";
signature-1 {
algo = "sha256,rsa2048";
sign-images = "kernel";
};
};
};
};--- common/image-fit.c | 3 ++- common/image.c | 1 + include/image.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
common/image-fit.c +2 -1
@@ -1925,7 +1925,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr, image_type ==IH_TYPE_FPGA ||fit_image_check_os (fit, noffset,IH_OS_LINUX ) ||fit_image_check_os (fit, noffset,IH_OS_U_BOOT ) || -fit_image_check_os (fit, noffset,IH_OS_OPENRTOS ); +fit_image_check_os (fit, noffset,IH_OS_OPENRTOS ) || +fit_image_check_os (fit, noffset,IH_OS_EFI );/* * If either of the checks fail, we should report an error, but
common/image.c +1 -0
@@ -134,6 +134,7 @@ static const table_entry_t uimage_os[] = { { IH_OS_OPENRTOS, "openrtos", "OpenRTOS", }, #endif { IH_OS_OPENSBI, "opensbi", "RISC-V OpenSBI", }, + { IH_OS_EFI, "efi", "EFI Firmware" }, { -1, "", "", }, };
include/image.h +1 -0
@@ -157,6 +157,7 @@ enum {IH_OS_ARM_TRUSTED_FIRMWARE ,/* ARM Trusted Firmware */ IH_OS_TEE ,/* Trusted Execution Environment */ IH_OS_OPENSBI ,/* RISC-V OpenSBI */ +IH_OS_EFI ,/* EFI Firmware (e.g. GRUB2) */ IH_OS_COUNT, };
Signature · 1 line
2.17.1
PATCH 2/2 bootm: Add a bootm command for type IH_OS_EFI
In reply to Cristian CiocalteaAdd support for booting EFI binaries contained in FIT images. A typical usage scenario is chain-loading GRUB2 in a verified boot environment.
--- cmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/bootm.h | 2 ++ 4 files changed, 55 insertions(+), 2 deletions(-)
cmd/Kconfig +8 -1
@@ -263,6 +263,13 @@ config CMD_BOOTI help Boot an AArch64 Linux Kernel image from memory. +config BOOTM_EFI + bool "Support booting EFI OS images" + depends on CMD_BOOTEFI + default y + help + Support booting EFI images via the bootm command. + config BOOTM_LINUX bool "Support booting Linux OS images" depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI
@@ -316,7 +323,7 @@ config CMD_BOOTEFI depends on EFI_LOADER default y help - Boot an EFI image from memory. + Boot an EFI binary from memory. config CMD_BOOTEFI_HELLO_COMPILE bool "Compile a standard EFI hello world binary for testing"
cmd/bootefi.c +1 -1
@@ -553,7 +553,7 @@ static int do_efi_selftest(void)* @argv: command line arguments * Return: status code */ -static int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {efi_status_t ret;
common/bootm_os.c +44 -0
56 lines not on this page · raw message
include/bootm.h +2 -0
@@ -37,7 +37,9 @@ typedef int boot_os_fn(int flag, int argc, char * const argv[],extern boot_os_fn do_bootm_linux;extern boot_os_fn do_bootm_vxworks; +int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);int do_bootelf (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); +void lynxkdi_boot (image_header_t *hdr);boot_os_fn *bootm_os_get_boot_func (int os);
Signature · 1 line
2.17.1
PATCH 2/2 bootm: Add a bootm command for type IH_OS_EFI
Quoted 76 lines · Cristian Ciocaltea
Add support for booting EFI binaries contained in FIT images. A typical usage scenario is chain-loading GRUB2 in a verified boot environment.
Signed-off-by Cristian Ciocaltea <[email protected]>--- cmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/bootm.h | 2 ++ 4 files changed, 55 insertions(+), 2 deletions(-)cmd/Kconfig +8
-1@@ -263,6 +263,13 @@ config CMD_BOOTI help Boot an AArch64 Linux Kernel image from memory. +config BOOTM_EFI + bool "Support booting EFI OS images" + depends on CMD_BOOTEFI + default y + help + Support booting EFI images via the bootm command. + config BOOTM_LINUX bool "Support booting Linux OS images" depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI@@ -316,7 +323,7 @@ config CMD_BOOTEFI depends on EFI_LOADER default y help - Boot an EFI image from memory. + Boot an EFI binary from memory. config CMD_BOOTEFI_HELLO_COMPILE bool "Compile a standard EFI hello world binary for testing"cmd/bootefi.c +1
-1@@ -553,7 +553,7 @@ static int do_efi_selftest(void)* @argv: command line arguments * Return: status code */ -static int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {efi_status_t ret;common/bootm_os.c +16
-0@@ -462,6 +462,47 @@ static int do_bootm_tee(int flag, int argc, char * const argv[], }#endif +#ifdef CONFIG_BOOTM_EFI +static int do_bootm_efi (int flag,int argc,char *const argv[], +bootm_headers_t *images) +{ +int ret; +int local_argc =2 ; +char *local_args[3 ]; +char str_efi_addr[16 ]; +char str_fdt_addr[16 ]; + +if (flag !=BOOTM_STATE_OS_GO ) +return 0 ; + +/* Locate FDT etc */ + ret =bootm_find_images (flag, argc, argv); +if (ret)
common/bootm_os.c static int do_bootm_tee(int flag, int argc, char * const argv[], · line 490
Quoted 10 lines
common/bootm_os.c +10
-0+return ret; + +printf ("## Transferring control to EFI (at address %08lx) ...\n" , + images->ep); +bootstage_mark (BOOTSTAGE_ID_RUN_OS ); + + local_args[0 ] = argv[0 ]; + +/* Write efi addr into string */ +sprintf (str_efi_addr,"%lx" , images->ep);
I think we should avoid transferring arguments as strings. It is preferable to separate do_bootefi() into an argument parser and an execution part.
Let's CC the developers who have contributed to common/bootm_os.c.
Best regards
Heinrich
Quoted 43 lines
common/bootm_os.c +18
-0+/* and provide it via the arguments */ + local_args[1 ] = str_efi_addr; + +if (images->ft_len) { +/* Write fdt addr into string */ +sprintf (str_fdt_addr,"%lx" , (unsigned long )images->ft_addr); +/* and provide it via the arguments */ + local_args[2 ] = str_fdt_addr; + local_argc =3 ; + } + +return do_bootefi (NULL ,0 , local_argc, local_args); +} +#endif +static boot_os_fn *boot_os[] = { [IH_OS_U_BOOT ] = do_bootm_standalone, #ifdef CONFIG_BOOTM_LINUX@@ -498,6 +539,9 @@ static boot_os_fn *boot_os[] = { #ifdef CONFIG_BOOTM_OPTEE [IH_OS_TEE ] = do_bootm_tee, #endif +#ifdef CONFIG_BOOTM_EFI + [IH_OS_EFI] = do_bootm_efi, +#endif };/* Allow for arch specific config before we boot */ include/bootm.h +2
-0@@ -37,7 +37,9 @@ typedef int boot_os_fn(int flag, int argc, char * const argv[],extern boot_os_fn do_bootm_linux;extern boot_os_fn do_bootm_vxworks; +int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);int do_bootelf (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); +void lynxkdi_boot (image_header_t *hdr);boot_os_fn *bootm_os_get_boot_func (int os);
PATCH 2/2 bootm: Add a bootm command for type IH_OS_EFI
Hi Cristian,
Quoted 93 lines · Heinrich Schuchardt
Quoted 76 lines · Cristian Ciocaltea
Add support for booting EFI binaries contained in FIT images. A typical usage scenario is chain-loading GRUB2 in a verified boot environment.
Signed-off-by Cristian Ciocaltea <[email protected]>--- cmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/bootm.h | 2 ++ 4 files changed, 55 insertions(+), 2 deletions(-)cmd/Kconfig +8
-1@@ -263,6 +263,13 @@ config CMD_BOOTI help Boot an AArch64 Linux Kernel image from memory. +config BOOTM_EFI + bool "Support booting EFI OS images" + depends on CMD_BOOTEFI + default y + help + Support booting EFI images via the bootm command. + config BOOTM_LINUX bool "Support booting Linux OS images" depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI@@ -316,7 +323,7 @@ config CMD_BOOTEFI depends on EFI_LOADER default y help - Boot an EFI image from memory. + Boot an EFI binary from memory. config CMD_BOOTEFI_HELLO_COMPILE bool "Compile a standard EFI hello world binary for testing"cmd/bootefi.c +1
-1@@ -553,7 +553,7 @@ static int do_efi_selftest(void)* @argv: command line arguments * Return: status code */ -static int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {efi_status_t ret;common/bootm_os.c +16
-0@@ -462,6 +462,47 @@ static int do_bootm_tee(int flag, int argc, char * const argv[], }#endif +#ifdef CONFIG_BOOTM_EFI +static int do_bootm_efi (int flag,int argc,char *const argv[], +bootm_headers_t *images) +{ +int ret; +int local_argc =2 ; +char *local_args[3 ]; +char str_efi_addr[16 ]; +char str_fdt_addr[16 ]; + +if (flag !=BOOTM_STATE_OS_GO ) +return 0 ; + +/* Locate FDT etc */ + ret =bootm_find_images (flag, argc, argv); +if (ret)common/bootm_os.c static int do_bootm_tee(int flag, int argc, char * const argv[], · line 490
Quoted 10 lines
common/bootm_os.c +10
-0+return ret; + +printf ("## Transferring control to EFI (at address %08lx) ...\n" , + images->ep); +bootstage_mark (BOOTSTAGE_ID_RUN_OS ); + + local_args[0 ] = argv[0 ]; + +/* Write efi addr into string */ +sprintf (str_efi_addr,"%lx" , images->ep);I think we should avoid transferring arguments as strings. It is preferable to separate
do_bootefi()into an argument parser and an execution part.
Quoted 1 line
Let's CC the developers who have contributed to
common/bootm_os.c.
Yes I think it would be good to create a function to hold most of the code from do_bootefi(), call the function with appropriate parameters and changing do_bootefi() to call that new function.
Quoted 41 lines
Best regards
Heinrich
Quoted 36 lines
common/bootm_os.c +18
-0+/* and provide it via the arguments */ + local_args[1 ] = str_efi_addr; + +if (images->ft_len) { +/* Write fdt addr into string */ +sprintf (str_fdt_addr,"%lx" , (unsigned long )images->ft_addr); +/* and provide it via the arguments */ + local_args[2 ] = str_fdt_addr; + local_argc =3 ; + } + +return do_bootefi (NULL ,0 , local_argc, local_args); +} +#endif +static boot_os_fn *boot_os[] = { [IH_OS_U_BOOT ] = do_bootm_standalone, #ifdef CONFIG_BOOTM_LINUX@@ -498,6 +539,9 @@ static boot_os_fn *boot_os[] = { #ifdef CONFIG_BOOTM_OPTEE [IH_OS_TEE ] = do_bootm_tee, #endif +#ifdef CONFIG_BOOTM_EFI + [IH_OS_EFI] = do_bootm_efi, +#endif };/* Allow for arch specific config before we boot */ include/bootm.h +0
-0@@ -37,7 +37,9 @@ typedef int boot_os_fn(int flag, int argc, char * const argv[],extern boot_os_fn do_bootm_linux;extern boot_os_fn do_bootm_vxworks;
Quoted 1 line
include/bootm.h typedef int boot_os_fn(int flag, int argc, char * const argv[], · line 40
Quoted 1 line
include/bootm.h +1
-0+int do_bootefi (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);
Please add a function comment.
Quoted 7 lines
include/bootm.h typedef int boot_os_fn(int flag, int argc, char * const argv[], · line 45
Quoted 6 lines
include/bootm.h +1
-0int do_bootelf (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); +void lynxkdi_boot (image_header_t *hdr);boot_os_fn *bootm_os_get_boot_func (int os);
Regards,
Simon
PATCH 2/2 bootm: Add a bootm command for type IH_OS_EFI
Quoted 9 lines · Simon Glass
Quoted 5 lines
I think we should avoid transferring arguments as strings. It is preferable to separate
do_bootefi()into an argument parser and an execution part.Let's CC the developers who have contributed to
common/bootm_os.c.Yes I think it would be good to create a function to hold most of the code from
do_bootefi(), call the function with appropriate parameters and changingdo_bootefi()to call that new function.
Hello Simon,
you are responding to an outdated version of the patch. Please, see
https://patchwork.ozlabs.org/patch/1215251/
[v4,2/5] bootm: Add a bootm command for type IH_OS_EFI
Best regards
Heinrich
cover Add support for booting EFI FIT images
In reply to Cristian CiocalteaQuoted 40 lines · Cristian Ciocaltea
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type -
IH_OS_EFI- which can be created by using 'os = "efi"' inside an ITS file:/ { #address-cells = <1>; images { efi-grub { description = "GRUB EFI"; data = /incbin/("EFI/BOOT/bootarm.efi"); type = "kernel_noload"; arch = "arm"; os = "efi"; compression = "none"; load = <0x0>; entry = <0x0>; hash-1 { algo = "sha256"; }; }; }; configurations { default = "config-grub"; config-grub { kernel = "efi-grub"; signature-1 { algo = "sha256,rsa2048"; sign-images = "kernel"; }; }; }; };
Quoted 8 lines
The bootm command has been extended to handle the
IH_OS_EFIimages. To enable this feature, a new configuration option has been added:BOOTM_EFII tested the solution using the '
qemu_arm' board:=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grub
Thanks a lot for the patch series which makes good sense to me.
I think we should pass addresses and not strings to cmd/bootefi.c. This will need a bit of refactoring as already addressed in a comment to patch 2/2.
Additionally the documentation in doc/uefi/u-boot_on_efi.rst and doc/uImage.FIT/howto.txt should be updated.
I cc the contributors given byscripts/get_maintainer.pl -f common/bootm_os.c
Best regards
Heinrich
Quoted 15 lines
Cristian Ciocaltea (2):
image: AddIH_OS_EFIfor EFI chain-load boot
bootm: Add a bootm command for typeIH_OS_EFIcmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ common/image-fit.c | 3 ++- common/image.c | 1 + include/bootm.h | 2 ++ include/image.h | 1 + 7 files changed, 59 insertions(+), 3 deletions(-)
cover Add support for booting EFI FIT images
Quoted 59 lines · Heinrich Schuchardt
Quoted 40 lines · Cristian Ciocaltea
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type -
IH_OS_EFI- which can be created by using 'os = "efi"' inside an ITS file:/ { #address-cells = <1>; images { efi-grub { description = "GRUB EFI"; data = /incbin/("EFI/BOOT/bootarm.efi"); type = "kernel_noload"; arch = "arm"; os = "efi"; compression = "none"; load = <0x0>; entry = <0x0>; hash-1 { algo = "sha256"; }; }; }; configurations { default = "config-grub"; config-grub { kernel = "efi-grub"; signature-1 { algo = "sha256,rsa2048"; sign-images = "kernel"; }; }; }; };Quoted 8 lines
The bootm command has been extended to handle the
IH_OS_EFIimages. To enable this feature, a new configuration option has been added:BOOTM_EFII tested the solution using the '
qemu_arm' board:=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grubThanks a lot for the patch series which makes good sense to me.
I think we should pass addresses and not strings to
cmd/bootefi.c. This will need a bit of refactoring as already addressed in a comment to patch 2/2.Additionally the documentation in
doc/uefi/u-boot_on_efi.rstanddoc/uImage.FIT/howto.txtshould be updated.
Quoted 7 lines
I cc the contributors given by
scripts/get_maintainer.pl-fcommon/bootm_os.cBest regards
Heinrich
Thanks for the feedback, Heinrich!
Instead of creating new function(s), I think we could simply extend
int do_bootefi_image(const char *image_opt)
with a new parameter to hold the fdt address and move here the call to 'efi_install_fdt()', which is now performed by 'do_bootefi()'.
However, I'm not sure about changing the data types, i.e. from 'char *' to ulong, for the following reasons:
1. image_opt may have a different meaning in addition to efi address
2. fdt address may not be provided, so we need somehow to detect an invalid value
Kind regards,
Cristian
Quoted 16 lines
Quoted 15 lines
Cristian Ciocaltea (2):
image: AddIH_OS_EFIfor EFI chain-load boot
bootm: Add a bootm command for typeIH_OS_EFIcmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ common/image-fit.c | 3 ++- common/image.c | 1 + include/bootm.h | 2 ++ include/image.h | 1 + 7 files changed, 59 insertions(+), 3 deletions(-)
cover Add support for booting EFI FIT images
Quoted 68 lines · Cristian Ciocaltea
Quoted 59 lines · Heinrich Schuchardt
Quoted 40 lines · Cristian Ciocaltea
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type -
IH_OS_EFI- which can be created by using 'os = "efi"' inside an ITS file:/ { #address-cells = <1>; images { efi-grub { description = "GRUB EFI"; data = /incbin/("EFI/BOOT/bootarm.efi"); type = "kernel_noload"; arch = "arm"; os = "efi"; compression = "none"; load = <0x0>; entry = <0x0>; hash-1 { algo = "sha256"; }; }; }; configurations { default = "config-grub"; config-grub { kernel = "efi-grub"; signature-1 { algo = "sha256,rsa2048"; sign-images = "kernel"; }; }; }; };Quoted 8 lines
The bootm command has been extended to handle the
IH_OS_EFIimages. To enable this feature, a new configuration option has been added:BOOTM_EFII tested the solution using the '
qemu_arm' board:=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grubThanks a lot for the patch series which makes good sense to me.
I think we should pass addresses and not strings to
cmd/bootefi.c. This will need a bit of refactoring as already addressed in a comment to patch 2/2.Additionally the documentation in
doc/uefi/u-boot_on_efi.rstanddoc/uImage.FIT/howto.txtshould be updated.Quoted 7 lines
I cc the contributors given by
scripts/get_maintainer.pl-fcommon/bootm_os.cBest regards
Heinrich
Quoted 6 lines
Thanks for the feedback, Heinrich!
Instead of creating new function(s), I think we could simply extend
intdo_bootefi_image(const char *image_opt)
with a new parameter to hold the fdt address and move here the call to 'efi_install_fdt()', which is now performed by 'do_bootefi()'.
efi_install_fdt() has to be called for the 'bootefi bootmgr' command too so the refactoring is a bit more complicated. I have started on that.
The first step is to change efi_install_fdt() to expect the argument as address instead of a string.
fdt_addr==NULL indicates no device tree supplied by user.
Best regards
Heinrich
Quoted 31 lines
However, I'm not sure about changing the data types, i.e. from 'char *' to ulong, for the following reasons:
1.image_optmay have a different meaning in addition to efi address
2. fdt address may not be provided, so we need somehow to detect an invalid valueKind regards,
CristianQuoted 6 lines
Quoted 6 lines
Cristian Ciocaltea (2):
image: AddIH_OS_EFIfor EFI chain-load boot
bootm: Add a bootm command for typeIH_OS_EFIQuoted 10 lines
Quoted 9 lines
cmd/Kconfig | 9 ++++++++- cmd/bootefi.c | 2 +- common/bootm_os.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ common/image-fit.c | 3 ++- common/image.c | 1 + include/bootm.h | 2 ++ include/image.h | 1 + 7 files changed, 59 insertions(+), 3 deletions(-)_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
cover Add support for booting EFI FIT images
Quoted 82 lines · Heinrich Schuchardt
Quoted 68 lines · Cristian Ciocaltea
Quoted 59 lines · Heinrich Schuchardt
Quoted 40 lines · Cristian Ciocaltea
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type -
IH_OS_EFI- which can be created by using 'os = "efi"' inside an ITS file:/ {
#address-cells = <1>;images {
efi-grub {
description = "GRUB EFI";
data = /incbin/("EFI/BOOT/bootarm.efi"); type = "kernel_noload";
arch = "arm";
os = "efi";
compression = "none";
load = <0x0>;
entry = <0x0>;
hash-1 {
algo = "sha256";
};
};
};configurations {
default = "config-grub";
config-grub {
kernel = "efi-grub";
signature-1 {
algo = "sha256,rsa2048";
sign-images = "kernel";
};
};
};
};Quoted 8 lines
The bootm command has been extended to handle the
IH_OS_EFIimages. To enable this feature, a new configuration option has been added:BOOTM_EFII tested the solution using the '
qemu_arm' board:=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grubThanks a lot for the patch series which makes good sense to me.
I think we should pass addresses and not strings to
cmd/bootefi.c. This will need a bit of refactoring as already addressed in a comment to patch 2/2.Additionally the documentation in
doc/uefi/u-boot_on_efi.rstanddoc/uImage.FIT/howto.txtshould be updated.Quoted 7 lines
I cc the contributors given by
scripts/get_maintainer.pl-fcommon/bootm_os.cBest regards
Heinrich
Quoted 6 lines
Thanks for the feedback, Heinrich!
Instead of creating new function(s), I think we could simply extend int
do_bootefi_image(const char *image_opt)
with a new parameter to hold the fdt address and move here the call to 'efi_install_fdt()', which is now performed by 'do_bootefi()'.
efi_install_fdt()has to be called for the 'bootefi bootmgr' command too so the refactoring is a bit more complicated. I have started on that.The first step is to change
efi_install_fdt()to expect the argument as address instead of a string.
Quoted 18 lines
fdt_addr==NULL indicates no device tree supplied by user.
Best regards
Heinrich
Quoted 9 lines
However, I'm not sure about changing the data types, i.e. from
'char *' to ulong, for the following reasons:
1.image_optmay have a different meaning in addition to efi address
2. fdt address may not be provided, so we need somehow to detect an >> invalid valueKind regards,
Cristian
Hello Christian,
patch seriesefi_loader: prepare for FIT images
https://lists.denx.de/pipermail/u-boot/2019-December/393192.html
is now available. It offers these functions:
/* Install device tree */efi_status_t efi_install_fdt(uintptr_t fdt_addr);
/* Run loaded UEFI image */efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size);
Could you, please, rebase your patches on this patch series.
Please, call efi_install_fdt with EFI_FDT_USE_INTERNAL if no device tree is supplied by the FIT image.
The patch series is also available in branch efi-2020-04 at
https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git
Best regards
Heinrich
cover Add support for booting EFI FIT images
Quoted 119 lines · Heinrich Schuchardt
Quoted 82 lines · Heinrich Schuchardt
Quoted 68 lines · Cristian Ciocaltea
Quoted 59 lines · Heinrich Schuchardt
Quoted 40 lines · Cristian Ciocaltea
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type -
IH_OS_EFI- which can be created by using 'os = "efi"' inside an ITS file:/ {
#address-cells = <1>;images {
efi-grub {
description = "GRUB EFI";
data = /incbin/("EFI/BOOT/bootarm.efi"); type = "kernel_noload";
arch = "arm";
os = "efi";
compression = "none";
load = <0x0>;
entry = <0x0>;
hash-1 {
algo = "sha256";
};
};
};configurations {
default = "config-grub";
config-grub {
kernel = "efi-grub";
signature-1 {
algo = "sha256,rsa2048";
sign-images = "kernel";
};
};
};
};Quoted 8 lines
The bootm command has been extended to handle the
IH_OS_EFIimages. To enable this feature, a new configuration option has been added:BOOTM_EFII tested the solution using the '
qemu_arm' board:=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grubThanks a lot for the patch series which makes good sense to me.
I think we should pass addresses and not strings to
cmd/bootefi.c. This will need a bit of refactoring as already addressed in a comment to patch 2/2.Additionally the documentation in
doc/uefi/u-boot_on_efi.rstanddoc/uImage.FIT/howto.txtshould be updated.Quoted 7 lines
I cc the contributors given by
scripts/get_maintainer.pl-fcommon/bootm_os.cBest regards
Heinrich
Quoted 6 lines
Thanks for the feedback, Heinrich!
Instead of creating new function(s), I think we could simply extend int
do_bootefi_image(const char *image_opt)
with a new parameter to hold the fdt address and move here the call to 'efi_install_fdt()', which is now performed by 'do_bootefi()'.
efi_install_fdt()has to be called for the 'bootefi bootmgr' command too so the refactoring is a bit more complicated. I have started on that.The first step is to change
efi_install_fdt()to expect the argument as address instead of a string.Quoted 18 lines
fdt_addr==NULL indicates no device tree supplied by user.
Best regards
Heinrich
Quoted 9 lines
However, I'm not sure about changing the data types, i.e. from
'char *' to ulong, for the following reasons:
1.image_optmay have a different meaning in addition to efi address
2. fdt address may not be provided, so we need somehow to detect an >> invalid valueKind regards,
CristianHello Christian,
patch series
efi_loader: prepare for FIT images
https://lists.denx.de/pipermail/u-boot/2019-December/393192.html
is now available. It offers these functions:/* Install device tree */
efi_status_tefi_install_fdt(uintptr_t fdt_addr);
/* Run loaded UEFI image */efi_status_tefi_run_image(void *source_buffer, efi_uintn_t source_size);Could you, please, rebase your patches on this patch series.
Please, call
efi_install_fdtwithEFI_FDT_USE_INTERNALif no device tree is supplied by the FIT image.
Quoted 6 lines
The patch series is also available in branch efi-2020-04 at
https://gitlab.denx.de/u-boot/custodians/u-boot-efi.gitBest regards
Heinrich
Hello Heinrich,
Thanks for the patch series!
I will send the updated patches by latest tomorrow EOD.
You also mentioned updating the documentation in doc/uefi/u-boot_on_efi.rst and doc/uImage.FIT/howto.txt.
I've checked those documents and their content is quite generic, not particularly related to this work. The former describes how to build and run u-boot as an EFI application/payload, while the later shows how to build and use FIT images.
If you agree, I could instead add a new ITS file in uImage.FIT folder and describe there the new functionality.
Kind regards,
Cristian
cover Add support for booting EFI FIT images
Quoted 135 lines · Cristian Ciocaltea
Quoted 119 lines · Heinrich Schuchardt
Quoted 82 lines · Heinrich Schuchardt
Quoted 68 lines · Cristian Ciocaltea
Quoted 59 lines · Heinrich Schuchardt
Quoted 40 lines · Cristian Ciocaltea
Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario.
The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries.
The implementation relies on a new image type -
IH_OS_EFI- which can be created by using 'os = "efi"' inside an ITS file:/ {
#address-cells = <1>;images {
efi-grub {
description = "GRUB EFI";
data = /incbin/("EFI/BOOT/bootarm.efi"); type = "kernel_noload";
arch = "arm";
os = "efi";
compression = "none";
load = <0x0>;
entry = <0x0>;
hash-1 {
algo = "sha256";
};
};
};configurations {
default = "config-grub";
config-grub {
kernel = "efi-grub";
signature-1 {
algo = "sha256,rsa2048";
sign-images = "kernel";
};
};
};
};Quoted 8 lines
The bootm command has been extended to handle the
IH_OS_EFIimages. To enable this feature, a new configuration option has been added:BOOTM_EFII tested the solution using the '
qemu_arm' board:=> load scsi 0:1 ${kernel_addr_r} efi-image.fit
=> bootm ${kernel_addr_r}#config-grubThanks a lot for the patch series which makes good sense to me.
I think we should pass addresses and not strings to
cmd/bootefi.c. This will need a bit of refactoring as already addressed in a comment to patch 2/2.Additionally the documentation in
doc/uefi/u-boot_on_efi.rstanddoc/uImage.FIT/howto.txtshould be updated.Quoted 7 lines
I cc the contributors given by
scripts/get_maintainer.pl-fcommon/bootm_os.cBest regards
Heinrich
Quoted 6 lines
Thanks for the feedback, Heinrich!
Instead of creating new function(s), I think we could simply extend
intdo_bootefi_image(const char *image_opt)
with a new parameter to hold the fdt address and move here the call to 'efi_install_fdt()', which is now performed by 'do_bootefi()'.
efi_install_fdt()has to be called for the 'bootefi bootmgr' command too so the refactoring is a bit more complicated. I have started on that.The first step is to change
efi_install_fdt()to expect the argument as address instead of a string.Quoted 18 lines
fdt_addr==NULL indicates no device tree supplied by user.
Best regards
Heinrich
Quoted 9 lines
However, I'm not sure about changing the data types, i.e. from
'char *' to ulong, for the following reasons:
1.image_optmay have a different meaning in addition to efi address
2. fdt address may not be provided, so we need somehow to detect an >> invalid valueKind regards,
CristianHello Christian,
patch series
efi_loader: prepare for FIT images
https://lists.denx.de/pipermail/u-boot/2019-December/393192.html
is now available. It offers these functions:/* Install device tree */
efi_status_tefi_install_fdt(uintptr_t fdt_addr);
/* Run loaded UEFI image */efi_status_tefi_run_image(void *source_buffer, efi_uintn_t source_size);Could you, please, rebase your patches on this patch series.
Please, call
efi_install_fdtwithEFI_FDT_USE_INTERNALif no device tree is supplied by the FIT image.Quoted 6 lines
The patch series is also available in branch efi-2020-04 at
https://gitlab.denx.de/u-boot/custodians/u-boot-efi.gitBest regards
Heinrich
Hello Heinrich,
Thanks for the patch series!
I will send the updated patches by latest tomorrow EOD.You also mentioned updating the documentation in
doc/uefi/u-boot_on_efi.rstanddoc/uImage.FIT/howto.txt.
Quoted 7 lines
I've checked those documents and their content is quite generic, not particularly related to this work. The former describes how to build and run u-boot as an EFI application/payload, while the later shows how to build and use FIT images.
If you agree, I could instead add a new ITS file in uImage.FIT folder and describe there the new functionality.
Having an example in uImage.Fit will be very helpful. But I still think the capability to start UEFI binaries via FIT images should be mentioned in the documentation. Just add a section after "Executing a UEFI binary" in doc/uefi/uefi.rst, e.g.
Launching a UEFI binary from a FIT image
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A signed FIT image can be used to securely boot a UEFI image via the bootm command. A sample configuration is provided as file doc/uImage.FIT/uefi.its. See doc/uImage.FIT/howto.txt for an introduction to FIT images.
Best regards
Heinrich
Quoted 5 lines
Kind regards,
Cristian