[PATCH 1/3] imx: hab: Allow hab_auth_img_or_fail to be called without ivt_offset
From: Eduard Strehlau eduard@lionizers.com
Since commit ea91031b2232 ("imx: hab: extend hab_auth_img to calculate ivt_offset"), it is possible to call the hab_auth_img command without the last ivt_offset argument.
Currently, calling hab_auth_img_or_fail without the last ivt_offset parameter causes a failure and the command usage text is shown.
Fix this problem by adjusting the argc logic to allow calling hab_auth_img_or_fail with only the address and size parameters.
This way, both hab_auth_img and hab_auth_img_or_fail have the same behavior with respect to the allowed number of command parameters.
Signed-off-by: Eduard Strehlau eduard@lionizers.com Signed-off-by: Fabio Estevam festevam@denx.de --- arch/arm/mach-imx/hab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 439cdaf07a7c..6cacca069d9f 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -659,7 +659,7 @@ static int do_authenticate_image_or_failover(struct cmd_tbl *cmdtp, int flag, { int ret = CMD_RET_FAILURE;
- if (argc != 4) { + if (argc < 3) { ret = CMD_RET_USAGE; goto error; }
From: Fabio Estevam festevam@denx.de
Split the hab_auth_img_or_fail usage text in two sentences to make it clearer.
Signed-off-by: Fabio Estevam festevam@denx.de --- arch/arm/mach-imx/hab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 6cacca069d9f..ea9c5d3c9fd4 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -712,7 +712,7 @@ U_BOOT_CMD( U_BOOT_CMD( hab_auth_img_or_fail, 4, 0, do_authenticate_image_or_failover, - "authenticate image via HAB on failure drop to USB BootROM mode", + "authenticate image via HAB. Switch to USB BootROM mode on failure", "addr length ivt_offset\n" "addr - image hex address\n" "length - image hex length\n"
From: Fabio Estevam festevam@denx.de Split the hab_auth_img_or_fail usage text in two sentences to make it clearer. Signed-off-by: Fabio Estevam festevam@denx.de
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
From: Fabio Estevam festevam@denx.de
The ivt_offset parameter is optional for both hab_auth_img_or_fail and hab_auth_img commands.
Document it in their usage texts to make it clearer.
Signed-off-by: Fabio Estevam festevam@denx.de --- arch/arm/mach-imx/hab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index ea9c5d3c9fd4..41121d575734 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -700,7 +700,7 @@ U_BOOT_CMD( "addr length ivt_offset\n" "addr - image hex address\n" "length - image hex length\n" - "ivt_offset - hex offset of IVT in the image" + "ivt_offset - hex offset of IVT in the image (optional)" );
U_BOOT_CMD( @@ -716,7 +716,7 @@ U_BOOT_CMD( "addr length ivt_offset\n" "addr - image hex address\n" "length - image hex length\n" - "ivt_offset - hex offset of IVT in the image" + "ivt_offset - hex offset of IVT in the image (optional)" );
U_BOOT_CMD(
From: Fabio Estevam festevam@denx.de The ivt_offset parameter is optional for both hab_auth_img_or_fail and hab_auth_img commands. Document it in their usage texts to make it clearer. Signed-off-by: Fabio Estevam festevam@denx.de
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
From: Eduard Strehlau eduard@lionizers.com Since commit ea91031b2232 ("imx: hab: extend hab_auth_img to calculate ivt_offset"), it is possible to call the hab_auth_img command without the last ivt_offset argument. Currently, calling hab_auth_img_or_fail without the last ivt_offset parameter causes a failure and the command usage text is shown. Fix this problem by adjusting the argc logic to allow calling hab_auth_img_or_fail with only the address and size parameters. This way, both hab_auth_img and hab_auth_img_or_fail have the same behavior with respect to the allowed number of command parameters.
Signed-off-by: Eduard Strehlau eduard@lionizers.com Signed-off-by: Fabio Estevam festevam@denx.de
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (2)
-
Fabio Estevam -
sbabic＠denx.de