MA-13488 check rpmb keyblob after SPL load container
To enable SPL+CONTAINER format on android auto with tee, after SPL load container, SPL need to check rpmb keyblob and copy it to secure memory for latter use. Change-Id: I40a791d5b5b1eba6a0170d6853626fb546be4b2c Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
This commit is contained in:
		
							parent
							
								
									378fa74172
								
							
						
					
					
						commit
						e26db8caf2
					
				|  | @ -26,6 +26,11 @@ | ||||||
| 
 | 
 | ||||||
| DECLARE_GLOBAL_DATA_PTR; | DECLARE_GLOBAL_DATA_PTR; | ||||||
| 
 | 
 | ||||||
|  | #if defined(CONFIG_IMX_TRUSTY_OS) | ||||||
|  | /* Pre-declaration of check_rpmb_blob. */ | ||||||
|  | int check_rpmb_blob(struct mmc *mmc); | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
| static int current_dev_type = MMC_DEV; | static int current_dev_type = MMC_DEV; | ||||||
| static int start_offset; | static int start_offset; | ||||||
| static void *device; | static void *device; | ||||||
|  | @ -228,7 +233,14 @@ int mmc_load_image_parse_container(struct spl_image_info *spl_image, | ||||||
| 
 | 
 | ||||||
| 	ret = read_auth_container(spl_image); | 	ret = read_auth_container(spl_image); | ||||||
| 
 | 
 | ||||||
|  | 	if (ret) | ||||||
| 		return ret; | 		return ret; | ||||||
|  | 
 | ||||||
|  | 	/* Images loaded, now check the rpmb keyblob for Trusty OS. */ | ||||||
|  | #if defined(CONFIG_IMX_TRUSTY_OS) | ||||||
|  | 	ret = check_rpmb_blob(mmc); | ||||||
|  | 	return ret; | ||||||
|  | #endif | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| int spi_load_image_parse_container(struct spl_image_info *spl_image, | int spi_load_image_parse_container(struct spl_image_info *spl_image, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue