GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

armv8: fsl-layerscape: fixes for TFABOOT framework

Browse source 
Fixes for TFABOOT framework
- update eMMC bootsrc to SD_MMC
- Increase buffer size for mcinitcmd from 256 to 512
- Fix mcinitcmd and bootcmd for Secure Boot

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Rajesh Bhagat 2018-12-27 04:37:49 +00:00 • committed by York Sun
parent d3689267f9
commit d23da2ae21
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
View file

@ -675,7 +675,7 @@ enum boot_src __get_boot_src(u32 porsr1)
break; break;
case RCW_SRC_EMMC_VAL: case RCW_SRC_EMMC_VAL:
/* RCW SRC EMMC */ /* RCW SRC EMMC */
src = BOOT_SOURCE_SD_MMC2; src = BOOT_SOURCE_SD_MMC;
break; break;
case RCW_SRC_I2C1_VAL: case RCW_SRC_I2C1_VAL:
/* RCW SRC I2C1 Extended */ /* RCW SRC I2C1 Extended */

13
arch/arm/cpu/armv8/fsl-layerscape/soc.c
View file

@ -684,7 +684,7 @@ int qspi_ahb_init(void)
#endif #endif
#ifdef CONFIG_TFABOOT #ifdef CONFIG_TFABOOT
#define MAX_BOOTCMD_SIZE 256 #define MAX_BOOTCMD_SIZE 512
int fsl_setenv_bootcmd(void) int fsl_setenv_bootcmd(void)
{ {
@ -812,6 +812,17 @@ int board_late_init(void)
fsl_setenv_bootcmd(); fsl_setenv_bootcmd();
fsl_setenv_mcinitcmd(); fsl_setenv_mcinitcmd();
} }
/*
* If the boot mode is secure, default environment is not present then
* setenv command needs to be run by default
*/
#ifdef CONFIG_CHAIN_OF_TRUST
if ((fsl_check_boot_mode_secure() == 1)) {
fsl_setenv_bootcmd();
fsl_setenv_mcinitcmd();
}
#endif
#endif #endif
#ifdef CONFIG_QSPI_AHB_INIT #ifdef CONFIG_QSPI_AHB_INIT
qspi_ahb_init(); qspi_ahb_init();