Message ID | 20190312011846.6022-1-bryan.odonoghue@linaro.org |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot,RESEND] cmd: image_info: Add checking of default FIT config | expand |
On Tue, Mar 12, 2019 at 01:18:46AM +0000, Bryan O'Donoghue wrote: > This patch adds a check for the default FIT config to iminfo. Once applied > any signing of the config will show a pass fail similar to rsa+/rsa-. > > Output looks like this: > > Hash(es) for Image 0 (kernel@1): sha1+ > Hash(es) for Image 1 (fdt@imx7s-warp.dtb): sha1+ > Hash(es) for Image 2 (ramdisk@1): sha1+ > Hash(es) for Image 3 (bootscr): sha1+ > Hash for default configuration: sha1,rsa2048:mbl-fit-rot-key+ > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Cc: Jun Nie <jun.nie@linaro.org> > Cc: Simon Glass <sjg@chromium.org> > Cc: Tom Rini <trini@konsulko.com> > Reviewed-by: Simon Glass <sjg@chromium.org> NAK, this blows up a ton of boards with Linksprite_pcDuino and pine_h64 being two examples. Thanks!
diff --git a/cmd/bootm.c b/cmd/bootm.c index c3a063474a..b3bd236165 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -244,6 +244,9 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int image_info(ulong addr) { +#if defined(CONFIG_FIT) + int cfg_noffset; +#endif void *hdr = (void *)addr; printf("\n## Checking Image at %08lx ...\n", addr); @@ -294,6 +297,20 @@ static int image_info(ulong addr) return 1; } + cfg_noffset = fit_conf_get_node(hdr, NULL); + if (!cfg_noffset) { + printf("Could not find configuration node: %s\n", + fdt_strerror(cfg_noffset)); + return 1; + } + + puts(" Hash for default configuration: "); + if (fit_config_verify(hdr, cfg_noffset)) { + puts("Unable to verify default fit config\n"); + return 1; + } + puts("\n"); + return 0; #endif default: