diff options
| -rw-r--r-- | include/drivers/emmc.h | 30 | ||||
| -rw-r--r-- | services/spd/trusty/trusty.c | 5 |
2 files changed, 20 insertions, 15 deletions
diff --git a/include/drivers/emmc.h b/include/drivers/emmc.h index 5f78dcef..4bd73284 100644 --- a/include/drivers/emmc.h +++ b/include/drivers/emmc.h @@ -131,21 +131,21 @@ typedef struct emmc_ops { } emmc_ops_t; typedef struct emmc_csd { - unsigned char not_used: 1; - unsigned char crc: 7; - unsigned char ecc: 2; - unsigned char file_format: 2; - unsigned char tmp_write_protect: 1; - unsigned char perm_write_protect: 1; - unsigned char copy: 1; - unsigned char file_format_grp: 1; - - unsigned short reserved_1: 5; - unsigned short write_bl_partial: 1; - unsigned short write_bl_len: 4; - unsigned short r2w_factor: 3; - unsigned short default_ecc: 2; - unsigned short wp_grp_enable: 1; + unsigned int not_used: 1; + unsigned int crc: 7; + unsigned int ecc: 2; + unsigned int file_format: 2; + unsigned int tmp_write_protect: 1; + unsigned int perm_write_protect: 1; + unsigned int copy: 1; + unsigned int file_format_grp: 1; + + unsigned int reserved_1: 5; + unsigned int write_bl_partial: 1; + unsigned int write_bl_len: 4; + unsigned int r2w_factor: 3; + unsigned int default_ecc: 2; + unsigned int wp_grp_enable: 1; unsigned int wp_grp_size: 5; unsigned int erase_grp_mult: 5; diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index 4c688caa..78a68ba0 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -236,7 +236,12 @@ static int32_t trusty_init(void) int reg_width = GET_RW(read_ctx_reg(get_el3state_ctx(&ctx->cpu_ctx), CTX_SPSR_EL3)); + /* + * Get information about the Trusty image. Its absence is a critical + * failure. + */ ep_info = bl31_plat_get_next_image_ep_info(SECURE); + assert(ep_info); cm_el1_sysregs_context_save(NON_SECURE); |