imx :hab: Add hab version command

THe RVT data includes a major and minor version in its header
parameter. Add a new command to print this out.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index b905d84bdc853cbb20f169b2da215a06708e50c7..d8bd77075ae6ac61d27f2e16dd7436234b99e09e 100644 (file)
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -189,6 +189,7 @@ typedef void hapi_clock_init_t(void);
 #define HAB_CID_ROM 0 /**< ROM Caller ID */
 #define HAB_CID_UBOOT 1 /**< UBOOT Caller ID*/
 
+#define HAB_TAG_RVT          0xDD  /* ROM Vector Table */
 #define HAB_CMD_HDR          0xD4  /* CSF Header */
 #define HAB_CMD_WRT_DAT      0xCC  /* Write Data command tag */
 #define HAB_CMD_CHK_DAT      0xCF  /* Check Data command tag */

diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index ce50dbe907c143ba6322393db41635bb6905694d..30db820b565f50770e72cae43922816d021dcbb4 100644 (file)
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -365,6 +365,21 @@ static int do_hab_failsafe(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
+static int do_hab_version(cmd_tbl_t *cmdtp, int flag, int argc,
+                         char * const argv[])
+{
+       struct hab_hdr *hdr = (struct hab_hdr *)HAB_RVT_BASE;
+
+       if (hdr->tag != HAB_TAG_RVT) {
+               printf("Unexpected header tag: %x\n", hdr->tag);
+               return CMD_RET_FAILURE;
+       }
+
+       printf("HAB version: %d.%d\n", hdr->par >> 4, hdr->par & 0xf);
+
+       return 0;
+}
+
 static int do_authenticate_image_or_failover(cmd_tbl_t *cmdtp, int flag,
                                             int argc, char * const argv[])
 {
@@ -421,6 +436,12 @@ U_BOOT_CMD(
                "ivt_offset - hex offset of IVT in the image"
          );
 
+U_BOOT_CMD(
+               hab_version, 1, 0, do_hab_version,
+               "print HAB major/minor version",
+               ""
+         );
+
 #endif /* !defined(CONFIG_SPL_BUILD) */
 
 /* Get CSF Header length */