]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
imx: mx6: hab : Remove the cache issue workaroud in hab for i.MX6QP
authorYe.Li <B37916@freescale.com>
Sat, 11 Jul 2015 03:38:44 +0000 (11:38 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 9 Sep 2015 12:33:24 +0000 (14:33 +0200)
Since the i.MX6QP has fixed the issue in boot ROM, so remove the workaround
for i.MX6QP.

Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
arch/arm/cpu/armv7/cpu.c
arch/arm/cpu/armv7/mx6/hab.c
arch/arm/include/asm/arch-mx6/hab.h
include/configs/tx6.h

index 9dea9ab43f064e76099aa5782896ed9e3e3783df..f5160b93e5530c80ac97d53e9d743b1d8db83e6e 100644 (file)
@@ -35,15 +35,7 @@ int cleanup_before_linux_select(int flags)
         */
 #ifndef CONFIG_SPL_BUILD
        disable_interrupts();
-#ifdef CONFIG_LCD
-       {
-               /* switch off LCD panel */
-               lcd_panel_disable();
-               /* disable LCD controller */
-               lcd_disable();
-       }
-#endif /* CONFIG_LCD */
-#endif /* CONFIG_SPL_BUILD */
+#endif
 
        /*
         * Turn off I-cache and invalidate it
index 41c37ba15c5db63381f7be42b234a7edaa30b80e..aaf0d33a42da92fe625e9f015df06ef3ecb64798 100644 (file)
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hab.h>
 
-HAB_FUNC(entry, hab_status_t)
-HAB_FUNC(exit, hab_status_t)
+HAB_FUNC(entry, enum hab_status)
+HAB_FUNC(exit, enum hab_status)
 HAB_FUNC5(authenticate_image, void *, uint8_t, size_t, void **, size_t *, hab_loader_callback_f_t)
-//HAB_FUNC1(run_dcd, hab_status_t, const uint8_t *)
-HAB_FUNC2(run_csf, hab_status_t, const uint8_t *, uint8_t)
-HAB_FUNC2(report_status, hab_status_t, hab_config_t *, hab_state_t *)
-HAB_FUNC4(report_event, hab_status_t, hab_status_t, uint32_t, uint8_t *, size_t *)
-HAB_FUNC3(check_target, hab_status_t, uint8_t, const void *, size_t)
-HAB_FUNC3(assert, hab_status_t, uint8_t, const void *, size_t)
-
-struct mx6_ivt {
-       u32 header;
-       u32 entry;
-       u32 rsrvd1;
-       void *dcd;
-       struct mx6_boot_data *boot_data;
-       void *self;
-       void *csf;
-       u32 rsrvd2;
-};
-
-struct mx6_boot_data {
-       void *start;
-       u32 length;
-       u32 plugin;
-};
-
-#define IVT_SIZE               0x20
-#define ALIGN_SIZE             0x400
-#define CSF_PAD_SIZE           0x2000
-#define MX6DQ_PU_IROM_MMU_EN_VAR       0x009024a8
-#define MX6DLS_PU_IROM_MMU_EN_VAR      0x00901dd0
-#define MX6SL_PU_IROM_MMU_EN_VAR       0x00900a18
+//HAB_FUNC1(run_dcd, enum hab_status, const uint8_t *)
+HAB_FUNC2(run_csf, enum hab_status, const uint8_t *, uint8_t)
+HAB_FUNC2(report_status, enum hab_status, enum hab_config *, enum hab_state *)
+HAB_FUNC4(report_event, enum hab_status, enum hab_status, uint32_t, uint8_t *, size_t *)
+HAB_FUNC3(check_target, enum hab_status, uint8_t, const void *, size_t)
+HAB_FUNC3(assert, enum hab_status, uint8_t, const void *, size_t)
 
-/*
- * +------------+  0x0 (DDR_UIMAGE_START) -
- * |   Header   |                          |
- * +------------+  0x40                    |
- * |            |                          |
- * |            |                          |
- * |            |                          |
- * |            |                          |
- * | Image Data |                          |
- * .            |                          |
- * .            |                           > Stuff to be authenticated ----+
- * .            |                          |                                |
- * |            |                          |                                |
- * |            |                          |                                |
- * +------------+                          |                                |
- * |            |                          |                                |
- * | Fill Data  |                          |                                |
- * |            |                          |                                |
- * +------------+ Align to ALIGN_SIZE      |                                |
- * |    IVT     |                          |                                |
- * +------------+ + IVT_SIZE              -                                 |
- * |            |                                                           |
- * |  CSF DATA  | <---------------------------------------------------------+
- * |            |
- * +------------+
- * |            |
- * | Fill Data  |
- * |            |
- * +------------+ + CSF_PAD_SIZE
- */
-
-#define MAX_RECORD_BYTES     (8*1024) /* 4 kbytes */
+#define MAX_RECORD_BYTES     (8 * 1024)
 
 struct record {
        uint8_t  tag;                                           /* Tag */
@@ -86,73 +31,78 @@ struct record {
        bool     any_rec_flag;
 };
 
-char *rsn_str[] = {"RSN = HAB_RSN_ANY (0x00)\n",
-                                  "RSN = HAB_ENG_FAIL (0x30)\n",
-                                  "RSN = HAB_INV_ADDRESS (0x22)\n",
-                                  "RSN = HAB_INV_ASSERTION (0x0C)\n",
-                                  "RSN = HAB_INV_CALL (0x28)\n",
-                                  "RSN = HAB_INV_CERTIFICATE (0x21)\n",
-                                  "RSN = HAB_INV_COMMAND (0x06)\n",
-                                  "RSN = HAB_INV_CSF (0x11)\n",
-                                  "RSN = HAB_INV_DCD (0x27)\n",
-                                  "RSN = HAB_INV_INDEX (0x0F)\n",
-                                  "RSN = HAB_INV_IVT (0x05)\n",
-                                  "RSN = HAB_INV_KEY (0x1D)\n",
-                                  "RSN = HAB_INV_RETURN (0x1E)\n",
-                                  "RSN = HAB_INV_SIGNATURE (0x18)\n",
-                                  "RSN = HAB_INV_SIZE (0x17)\n",
-                                  "RSN = HAB_MEM_FAIL (0x2E)\n",
-                                  "RSN = HAB_OVR_COUNT (0x2B)\n",
-                                  "RSN = HAB_OVR_STORAGE (0x2D)\n",
-                                  "RSN = HAB_UNS_ALGORITHM (0x12)\n",
-                                  "RSN = HAB_UNS_COMMAND (0x03)\n",
-                                  "RSN = HAB_UNS_ENGINE (0x0A)\n",
-                                  "RSN = HAB_UNS_ITEM (0x24)\n",
-                                  "RSN = HAB_UNS_KEY (0x1B)\n",
-                                  "RSN = HAB_UNS_PROTOCOL (0x14)\n",
-                                  "RSN = HAB_UNS_STATE (0x09)\n",
-                                  "RSN = INVALID\n",
-                                  NULL};
-
-char *sts_str[] = {"STS = HAB_SUCCESS (0xF0)\n",
-                                  "STS = HAB_FAILURE (0x33)\n",
-                                  "STS = HAB_WARNING (0x69)\n",
-                                  "STS = INVALID\n",
-                                  NULL};
-
-char *eng_str[] = {"ENG = HAB_ENG_ANY (0x00)\n",
-                                  "ENG = HAB_ENG_SCC (0x03)\n",
-                                  "ENG = HAB_ENG_RTIC (0x05)\n",
-                                  "ENG = HAB_ENG_SAHARA (0x06)\n",
-                                  "ENG = HAB_ENG_CSU (0x0A)\n",
-                                  "ENG = HAB_ENG_SRTC (0x0C)\n",
-                                  "ENG = HAB_ENG_DCP (0x1B)\n",
-                                  "ENG = HAB_ENG_CAAM (0x1D)\n",
-                                  "ENG = HAB_ENG_SNVS (0x1E)\n",
-                                  "ENG = HAB_ENG_OCOTP (0x21)\n",
-                                  "ENG = HAB_ENG_DTCP (0x22)\n",
-                                  "ENG = HAB_ENG_ROM (0x36)\n",
-                                  "ENG = HAB_ENG_HDCP (0x24)\n",
-                                  "ENG = HAB_ENG_RTL (0x77)\n",
-                                  "ENG = HAB_ENG_SW (0xFF)\n",
-                                  "ENG = INVALID\n",
-                                  NULL};
-
-char *ctx_str[] = {"CTX = HAB_CTX_ANY(0x00)\n",
-                                  "CTX = HAB_CTX_FAB (0xFF)\n",
-                                  "CTX = HAB_CTX_ENTRY (0xE1)\n",
-                                  "CTX = HAB_CTX_TARGET (0x33)\n",
-                                  "CTX = HAB_CTX_AUTHENTICATE (0x0A)\n",
-                                  "CTX = HAB_CTX_DCD (0xDD)\n",
-                                  "CTX = HAB_CTX_CSF (0xCF)\n",
-                                  "CTX = HAB_CTX_COMMAND (0xC0)\n",
-                                  "CTX = HAB_CTX_AUT_DAT (0xDB)\n",
-                                  "CTX = HAB_CTX_ASSERT (0xA0)\n",
-                                  "CTX = HAB_CTX_EXIT (0xEE)\n",
-                                  "CTX = INVALID\n",
-                                  NULL};
-
-uint8_t hab_statuses[5] = {
+char *rsn_str[] = {
+       "RSN = HAB_RSN_ANY (0x00)\n",
+       "RSN = HAB_ENG_FAIL (0x30)\n",
+       "RSN = HAB_INV_ADDRESS (0x22)\n",
+       "RSN = HAB_INV_ASSERTION (0x0C)\n",
+       "RSN = HAB_INV_CALL (0x28)\n",
+       "RSN = HAB_INV_CERTIFICATE (0x21)\n",
+       "RSN = HAB_INV_COMMAND (0x06)\n",
+       "RSN = HAB_INV_CSF (0x11)\n",
+       "RSN = HAB_INV_DCD (0x27)\n",
+       "RSN = HAB_INV_INDEX (0x0F)\n",
+       "RSN = HAB_INV_IVT (0x05)\n",
+       "RSN = HAB_INV_KEY (0x1D)\n",
+       "RSN = HAB_INV_RETURN (0x1E)\n",
+       "RSN = HAB_INV_SIGNATURE (0x18)\n",
+       "RSN = HAB_INV_SIZE (0x17)\n",
+       "RSN = HAB_MEM_FAIL (0x2E)\n",
+       "RSN = HAB_OVR_COUNT (0x2B)\n",
+       "RSN = HAB_OVR_STORAGE (0x2D)\n",
+       "RSN = HAB_UNS_ALGORITHM (0x12)\n",
+       "RSN = HAB_UNS_COMMAND (0x03)\n",
+       "RSN = HAB_UNS_ENGINE (0x0A)\n",
+       "RSN = HAB_UNS_ITEM (0x24)\n",
+       "RSN = HAB_UNS_KEY (0x1B)\n",
+       "RSN = HAB_UNS_PROTOCOL (0x14)\n",
+       "RSN = HAB_UNS_STATE (0x09)\n",
+       "RSN = INVALID\n",
+};
+
+char *sts_str[] = {
+       "STS = HAB_STS_ANY (0x00)\n",
+       "STS = HAB_FAILURE (0x33)\n",
+       "STS = HAB_WARNING (0x69)\n",
+       "STS = HAB_SUCCESS (0xF0)\n",
+       "STS = INVALID\n",
+};
+
+char *eng_str[] = {
+       "ENG = HAB_ENG_ANY (0x00)\n",
+       "ENG = HAB_ENG_SCC (0x03)\n",
+       "ENG = HAB_ENG_RTIC (0x05)\n",
+       "ENG = HAB_ENG_SAHARA (0x06)\n",
+       "ENG = HAB_ENG_CSU (0x0A)\n",
+       "ENG = HAB_ENG_SRTC (0x0C)\n",
+       "ENG = HAB_ENG_DCP (0x1B)\n",
+       "ENG = HAB_ENG_CAAM (0x1D)\n",
+       "ENG = HAB_ENG_SNVS (0x1E)\n",
+       "ENG = HAB_ENG_OCOTP (0x21)\n",
+       "ENG = HAB_ENG_DTCP (0x22)\n",
+       "ENG = HAB_ENG_ROM (0x36)\n",
+       "ENG = HAB_ENG_HDCP (0x24)\n",
+       "ENG = HAB_ENG_RTL (0x77)\n",
+       "ENG = HAB_ENG_SW (0xFF)\n",
+       "ENG = INVALID\n",
+};
+
+char *ctx_str[] = {
+       "CTX = HAB_CTX_ANY(0x00)\n",
+       "CTX = HAB_CTX_FAB (0xFF)\n",
+       "CTX = HAB_CTX_ENTRY (0xE1)\n",
+       "CTX = HAB_CTX_TARGET (0x33)\n",
+       "CTX = HAB_CTX_AUTHENTICATE (0x0A)\n",
+       "CTX = HAB_CTX_DCD (0xDD)\n",
+       "CTX = HAB_CTX_CSF (0xCF)\n",
+       "CTX = HAB_CTX_COMMAND (0xC0)\n",
+       "CTX = HAB_CTX_AUT_DAT (0xDB)\n",
+       "CTX = HAB_CTX_ASSERT (0xA0)\n",
+       "CTX = HAB_CTX_EXIT (0xEE)\n",
+       "CTX = INVALID\n",
+};
+
+uint8_t hab_statuses[ARRAY_SIZE(sts_str)] = {
        HAB_STS_ANY,
        HAB_FAILURE,
        HAB_WARNING,
@@ -160,7 +110,7 @@ uint8_t hab_statuses[5] = {
        -1
 };
 
-uint8_t hab_reasons[26] = {
+uint8_t hab_reasons[ARRAY_SIZE(rsn_str)] = {
        HAB_RSN_ANY,
        HAB_ENG_FAIL,
        HAB_INV_ADDRESS,
@@ -189,7 +139,7 @@ uint8_t hab_reasons[26] = {
        -1
 };
 
-uint8_t hab_contexts[12] = {
+uint8_t hab_contexts[ARRAY_SIZE(ctx_str)] = {
        HAB_CTX_ANY,
        HAB_CTX_FAB,
        HAB_CTX_ENTRY,
@@ -204,7 +154,7 @@ uint8_t hab_contexts[12] = {
        -1
 };
 
-uint8_t hab_engines[16] = {
+uint8_t hab_engines[ARRAY_SIZE(eng_str)] = {
        HAB_ENG_ANY,
        HAB_ENG_SCC,
        HAB_ENG_RTIC,
@@ -330,9 +280,9 @@ int get_hab_status(void)
        return ret;
 }
 
-static inline hab_status_t hab_init(void)
+static inline enum hab_status hab_init(void)
 {
-       hab_status_t ret;
+       enum hab_status ret;
 
        if (!is_hab_enabled()) {
                puts("hab fuse not enabled\n");
@@ -351,9 +301,9 @@ static inline hab_status_t hab_init(void)
        return ret;
 }
 
-static inline hab_status_t hab_exit(void)
+static inline enum hab_status hab_exit(void)
 {
-       hab_status_t ret;
+       enum hab_status ret;
 
        ret = hab_rvt_exit();
        if (ret != HAB_SUCCESS)
@@ -364,9 +314,9 @@ static inline hab_status_t hab_exit(void)
        return ret;
 }
 
-static hab_status_t hab_check_target(hab_target_t type, uint32_t addr, size_t len)
+static enum hab_status hab_check_target(enum hab_target type, uint32_t addr, size_t len)
 {
-       hab_status_t ret;
+       enum hab_status ret;
 
        ret = hab_init();
        if (ret != HAB_SUCCESS)
@@ -386,9 +336,9 @@ static hab_status_t hab_check_target(hab_target_t type, uint32_t addr, size_t le
        return ret;
 }
 
-static hab_status_t hab_assert(uint32_t type, uint32_t addr, size_t len)
+static enum hab_status hab_assert(uint32_t type, uint32_t addr, size_t len)
 {
-       hab_status_t ret;
+       enum hab_status ret;
 
        ret = hab_init();
        if (ret != HAB_SUCCESS)
@@ -422,7 +372,7 @@ static int do_hab_status(cmd_tbl_t *cmdtp, int flag, int argc,
 static int do_hab_check_target(cmd_tbl_t *cmdtp, int flag, int argc,
                        char *const argv[])
 {
-       hab_target_t type = HAB_TGT_ANY;
+       enum hab_target type = HAB_TGT_ANY;
        uint32_t addr;
        size_t len;
 
index 87371bf63a7b286886625b5db7558579a9ab1f8d..bb66ec08a25a5e102d7f156eb353373c2469d3d8 100644 (file)
@@ -19,18 +19,18 @@ int get_hab_status(void);
 /* The following are taken from HAB4 SIS */
 
 /* Status definitions */
-typedef enum hab_status {
+enum hab_status {
        HAB_STS_ANY = 0x00,
        HAB_FAILURE = 0x33,
        HAB_WARNING = 0x69,
        HAB_SUCCESS = 0xf0
-} hab_status_t;
+};
 
 /* Security Configuration definitions */
 enum hab_config {
-       HAB_CFG_RETURN = 0x33,  /* < Field Return IC */
-       HAB_CFG_OPEN = 0xf0,    /* < Non-secure IC */
-       HAB_CFG_CLOSED = 0xcc   /* < Secure IC */
+       HAB_CFG_RETURN = 0x33,          /* Field Return IC */
+       HAB_CFG_OPEN = 0xf0,            /* Non-secure IC */
+       HAB_CFG_CLOSED = 0xcc           /* Secure IC */
 };
 
 /* State definitions */
@@ -40,17 +40,17 @@ enum hab_state {
        HAB_STATE_NONSECURE = 0x66,     /* Non-secure state */
        HAB_STATE_TRUSTED = 0x99,       /* Trusted state */
        HAB_STATE_SECURE = 0xaa,        /* Secure state */
-       HAB_STATE_FAIL_SOFT = 0xcc, /* Soft fail state */
-       HAB_STATE_FAIL_HARD = 0xff, /* Hard fail state (terminal) */
+       HAB_STATE_FAIL_SOFT = 0xcc,     /* Soft fail state */
+       HAB_STATE_FAIL_HARD = 0xff,     /* Hard fail state (terminal) */
        HAB_STATE_NONE = 0xf0,          /* No security state machine */
        HAB_STATE_MAX
-} hab_state_t;
+};
 
-typedef enum hab_target {
+enum hab_target {
        HAB_TGT_MEMORY = 0x0f, /* Check memory white list */
        HAB_TGT_PERIPHERAL = 0xf0, /* Check peripheral white list*/
        HAB_TGT_ANY = 0x55, /**< Check memory & peripheral white list */
-} hab_target_t;
+};
 
 enum HAB_FUNC_OFFSETS {
        HAB_RVT_HEADER,
@@ -67,43 +67,43 @@ enum HAB_FUNC_OFFSETS {
 };
 
 enum hab_reason {
-       HAB_RSN_ANY = 0x00,                     /* Match any reason */
+       HAB_RSN_ANY = 0x00,             /* Match any reason */
        HAB_ENG_FAIL = 0x30,            /* Engine failure */
        HAB_INV_ADDRESS = 0x22,         /* Invalid address: access denied */
-       HAB_INV_ASSERTION = 0x0c,   /* Invalid assertion */
+       HAB_INV_ASSERTION = 0x0c,       /* Invalid assertion */
        HAB_INV_CALL = 0x28,            /* Function called out of sequence */
-       HAB_INV_CERTIFICATE = 0x21, /* Invalid certificate */
-       HAB_INV_COMMAND = 0x06,     /* Invalid command: command malformed */
-       HAB_INV_CSF = 0x11,                     /* Invalid csf */
-       HAB_INV_DCD = 0x27,                     /* Invalid dcd */
+       HAB_INV_CERTIFICATE = 0x21,     /* Invalid certificate */
+       HAB_INV_COMMAND = 0x06,         /* Invalid command: command malformed */
+       HAB_INV_CSF = 0x11,             /* Invalid csf */
+       HAB_INV_DCD = 0x27,             /* Invalid dcd */
        HAB_INV_INDEX = 0x0f,           /* Invalid index: access denied */
-       HAB_INV_IVT = 0x05,                     /* Invalid ivt */
-       HAB_INV_KEY = 0x1d,                     /* Invalid key */
+       HAB_INV_IVT = 0x05,             /* Invalid ivt */
+       HAB_INV_KEY = 0x1d,             /* Invalid key */
        HAB_INV_RETURN = 0x1e,          /* Failed callback function */
-       HAB_INV_SIGNATURE = 0x18,   /* Invalid signature */
+       HAB_INV_SIGNATURE = 0x18,       /* Invalid signature */
        HAB_INV_SIZE = 0x17,            /* Invalid data size */
        HAB_MEM_FAIL = 0x2e,            /* Memory failure */
        HAB_OVR_COUNT = 0x2b,           /* Expired poll count */
        HAB_OVR_STORAGE = 0x2d,         /* Exhausted storage region */
-       HAB_UNS_ALGORITHM = 0x12,   /* Unsupported algorithm */
+       HAB_UNS_ALGORITHM = 0x12,       /* Unsupported algorithm */
        HAB_UNS_COMMAND = 0x03,         /* Unsupported command */
        HAB_UNS_ENGINE = 0x0a,          /* Unsupported engine */
        HAB_UNS_ITEM = 0x24,            /* Unsupported configuration item */
-       HAB_UNS_KEY = 0x1b,             /* Unsupported key type/parameters */
+       HAB_UNS_KEY = 0x1b,             /* Unsupported key type/parameters */
        HAB_UNS_PROTOCOL = 0x14,        /* Unsupported protocol */
        HAB_UNS_STATE = 0x09,           /* Unsuitable state */
        HAB_RSN_MAX
 };
 
 enum hab_context {
-       HAB_CTX_ANY = 0x00,                     /* Match any context */
-       HAB_CTX_FAB = 0xff,                 /* Event logged in hab_fab_test() */
+       HAB_CTX_ANY = 0x00,             /* Match any context */
+       HAB_CTX_FAB = 0xff,             /* Event logged in hab_fab_test() */
        HAB_CTX_ENTRY = 0xe1,           /* Event logged in hab_rvt.entry() */
-       HAB_CTX_TARGET = 0x33,      /* Event logged in hab_rvt.check_target() */
-       HAB_CTX_AUTHENTICATE = 0x0a,/* Logged in hab_rvt.authenticate_image() */
-       HAB_CTX_DCD = 0xdd,         /* Event logged in hab_rvt.run_dcd() */
-       HAB_CTX_CSF = 0xcf,         /* Event logged in hab_rvt.run_csf() */
-       HAB_CTX_COMMAND = 0xc0,     /* Event logged executing csf/dcd command */
+       HAB_CTX_TARGET = 0x33,          /* Event logged in hab_rvt.check_target() */
+       HAB_CTX_AUTHENTICATE = 0x0a,    /* Logged in hab_rvt.authenticate_image() */
+       HAB_CTX_DCD = 0xdd,             /* Event logged in hab_rvt.run_dcd() */
+       HAB_CTX_CSF = 0xcf,             /* Event logged in hab_rvt.run_csf() */
+       HAB_CTX_COMMAND = 0xc0,         /* Event logged executing csf/dcd command */
        HAB_CTX_AUT_DAT = 0xdb,         /* Authenticated data block */
        HAB_CTX_ASSERT = 0xa0,          /* Event logged in hab_rvt.assert() */
        HAB_CTX_EXIT = 0xee,            /* Event logged in hab_rvt.exit() */
@@ -118,37 +118,40 @@ typedef enum hab_status hab_rvt_report_status_t(enum hab_config *,
 typedef enum hab_status hab_loader_callback_f_t(void**, size_t*, const void*);
 typedef enum hab_status hab_rvt_entry_t(void);
 typedef enum hab_status hab_rvt_exit_t(void);
+typedef enum hab_status hab_rvt_check_target_t(enum hab_target, const void *,
+               size_t);
+
 typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t,
                void **, size_t *, hab_loader_callback_f_t);
 
-typedef hab_status_t hab_rvt_run_dcd_t(const uint8_t *dcd);
+typedef enum hab_status hab_rvt_run_dcd_t(const uint8_t *dcd);
 
-typedef hab_status_t hab_rvt_run_csf_t(const uint8_t *csf, uint8_t cid);
+typedef enum hab_status hab_rvt_run_csf_t(const uint8_t *csf, uint8_t cid);
 
-typedef hab_status_t hab_rvt_assert_t(uint32_t, const void *,
+typedef enum hab_status hab_rvt_assert_t(uint32_t, const void *,
                size_t);
 
-typedef hab_status_t hab_rvt_report_event_t(hab_status_t, uint32_t,
+typedef enum hab_status hab_rvt_report_event_t(enum hab_status, uint32_t,
                uint8_t* , size_t*);
 
-typedef hab_status_t hab_rvt_report_status_t(enum hab_config *,
+typedef enum hab_status hab_rvt_report_status_t(enum hab_config *,
                enum hab_state *);
 
 typedef void hapi_clock_init_t(void);
 
 #define HAB_ENG_ANY            0x00   /* Select first compatible engine */
 #define HAB_ENG_SCC            0x03   /* Security controller */
-#define HAB_ENG_RTIC   0x05   /* Run-time integrity checker */
-#define HAB_ENG_SAHARA  0x06   /* Crypto accelerator */
+#define HAB_ENG_RTIC           0x05   /* Run-time integrity checker */
+#define HAB_ENG_SAHARA         0x06   /* Crypto accelerator */
 #define HAB_ENG_CSU            0x0a   /* Central Security Unit */
-#define HAB_ENG_SRTC   0x0c   /* Secure clock */
+#define HAB_ENG_SRTC           0x0c   /* Secure clock */
 #define HAB_ENG_DCP            0x1b   /* Data Co-Processor */
-#define HAB_ENG_CAAM   0x1d   /* CAAM */
-#define HAB_ENG_SNVS   0x1e   /* Secure Non-Volatile Storage */
-#define HAB_ENG_OCOTP  0x21   /* Fuse controller */
-#define HAB_ENG_DTCP   0x22   /* DTCP co-processor */
+#define HAB_ENG_CAAM           0x1d   /* CAAM */
+#define HAB_ENG_SNVS           0x1e   /* Secure Non-Volatile Storage */
+#define HAB_ENG_OCOTP          0x21   /* Fuse controller */
+#define HAB_ENG_DTCP           0x22   /* DTCP co-processor */
 #define HAB_ENG_ROM            0x36   /* Protected ROM area */
-#define HAB_ENG_HDCP   0x24   /* HDCP co-processor */
+#define HAB_ENG_HDCP           0x24   /* HDCP co-processor */
 #define HAB_ENG_RTL            0x77   /* RTL simulation engine */
 #define HAB_ENG_SW             0xff   /* Software engine */
 
index 36ff58d6c80b4a3d9237d4e6c815b67b8bab33c4..aa0e7af33462f1c76bc51f3b1ac1aad9a9e50338 100644 (file)
@@ -10,7 +10,6 @@
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
-#include "mx6_common.h"
 
 /*
  * Ka-Ro TX6 board - SoC configuration