armv8: fsl-layerscape: fixes for TFABOOT framework

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>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 1fc025b581d9350ada6c50df26c95faf5b879acd..81babd1fb4c511bd097399052637e2f6c83d33d8 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -675,7 +675,7 @@ enum boot_src __get_boot_src(u32 porsr1)
                        break;
                case RCW_SRC_EMMC_VAL:
                /* RCW SRC EMMC */
-                       src = BOOT_SOURCE_SD_MMC2;
+                       src = BOOT_SOURCE_SD_MMC;
                        break;
                case RCW_SRC_I2C1_VAL:
                /* RCW SRC I2C1 Extended */

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 0092a2239484a5bbca1a79263578d56c2e2b3fb9..06f3edb302816345bed5a3f4db54a049dedb0e4a 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -684,7 +684,7 @@ int qspi_ahb_init(void)
 #endif
 
 #ifdef CONFIG_TFABOOT
-#define MAX_BOOTCMD_SIZE       256
+#define MAX_BOOTCMD_SIZE       512
 
 int fsl_setenv_bootcmd(void)
 {
@@ -812,6 +812,17 @@ int board_late_init(void)
                fsl_setenv_bootcmd();
                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
 #ifdef CONFIG_QSPI_AHB_INIT
        qspi_ahb_init();