summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5ad4d76)
raw | patch | inline | side by side (parent: 5ad4d76)
author | Jonathan Bergsagel <jbergsagel@ti.com> | |
Wed, 28 Oct 2020 23:25:57 +0000 (18:25 -0500) | ||
committer | Sivaraj R <sivaraj@ti.com> | |
Thu, 29 Oct 2020 14:02:13 +0000 (09:02 -0500) |
Transition to loading tifs.bin and reporting TIFS version,
instead of SYSFW.
Keep sysfw.bin for all other K3 SoCs.
Signed-off-by: Jonathan Bergsagel <jbergsagel@ti.com>
instead of SYSFW.
Keep sysfw.bin for all other K3 SoCs.
Signed-off-by: Jonathan Bergsagel <jbergsagel@ti.com>
diff --git a/packages/ti/boot/sbl/soc/k3/sbl_sci_client.c b/packages/ti/boot/sbl/soc/k3/sbl_sci_client.c
index 399277f4c4a831e3ba3dd3dc44c0822034239b03..6d54563786e9dffaa97bcb51b698d56d50658dee 100755 (executable)
status = SBL_ReadSysfwImage(&sysfw_ptr, SBL_SYSFW_MAX_SIZE);
if (status != CSL_PASS)
{
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ SBL_log(SBL_LOG_ERR,"TIFS read...FAILED \n");
+#else
SBL_log(SBL_LOG_ERR,"SYSFW read...FAILED \n");
+#endif
SblErrLoop(__FILE__, __LINE__);
}
if (status != CSL_PASS)
{
- SBL_log(SBL_LOG_ERR,"SYSFW get default board config...FAILED \n");
+ SBL_log(SBL_LOG_ERR,"Sciclient get default board config...FAILED \n");
SblErrLoop(__FILE__, __LINE__);
}
status = Sciclient_loadFirmware((const uint32_t *) sysfw_ptr);
if (status != CSL_PASS)
{
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ SBL_log(SBL_LOG_ERR,"TIFS load...FAILED \n");
+#else
SBL_log(SBL_LOG_ERR,"SYSFW load...FAILED \n");
+#endif
SblErrLoop(__FILE__, __LINE__);
}
status = Sciclient_init(&config);
if (status != CSL_PASS)
{
- SBL_log(SBL_LOG_ERR,"SYSFW init ...FAILED \n");
+ SBL_log(SBL_LOG_ERR,"Sciclient init ...FAILED \n");
SblErrLoop(__FILE__, __LINE__);
}
status = Sciclient_boardCfg(&sblBoardCfgPrms);
if (status != CSL_PASS)
{
- SBL_log(SBL_LOG_ERR,"SYSFW board config ...FAILED \n");
+ SBL_log(SBL_LOG_ERR,"Sciclient board config ...FAILED \n");
SblErrLoop(__FILE__, __LINE__);
}
#endif
status = Sciclient_boardCfgPm(&sblBoardCfgPmPrms);
if (status != CSL_PASS)
{
- SBL_log(SBL_LOG_ERR,"SYSFW board config pm...FAILED \n")
+ SBL_log(SBL_LOG_ERR,"Sciclient board config pm...FAILED \n")
SblErrLoop(__FILE__, __LINE__);
}
status = Sciclient_boardCfgRm(&sblBoardCfgRmPrms);
if (status != CSL_PASS)
{
- SBL_log(SBL_LOG_ERR,"SYSFW board config rm...FAILED \n");
+ SBL_log(SBL_LOG_ERR,"Sciclient board config rm...FAILED \n");
SblErrLoop(__FILE__, __LINE__);
}
#endif
status = Sciclient_boardCfgSec(&sblBoardCfgSecPrms);
if (status != CSL_PASS)
{
- SBL_log(SBL_LOG_ERR,"SYSFW board config sec...FAILED \n");
+ SBL_log(SBL_LOG_ERR,"Sciclient board config sec...FAILED \n");
SblErrLoop(__FILE__, __LINE__);
}
#if defined(SOC_AM65XX) || defined(SOC_J721E) || defined(SOC_J7200)
#endif
#endif
- /* Get SYSFW version */
+ /* Get SYSFW/TIFS version */
SBL_ADD_PROFILE_POINT;
if (SBL_LOG_LEVEL > SBL_LOG_ERR)
if (respPrm.flags == (uint32_t)TISCI_MSG_FLAG_ACK)
{
SBL_ADD_PROFILE_POINT;
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ SBL_log(SBL_LOG_MIN,"TIFS ver: %s\n", (char *) response.str);
+#else
SBL_log(SBL_LOG_MIN,"SYSFW ver: %s\n", (char *) response.str);
+#endif
}
else
{
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ SBL_log(SBL_LOG_ERR,"TIFS Get Version failed \n");
+#else
SBL_log(SBL_LOG_ERR,"SYSFW Get Version failed \n");
+#endif
SblErrLoop(__FILE__, __LINE__);
}
}
diff --git a/packages/ti/boot/sbl/src/hyperflash/sbl_hyperflash.c b/packages/ti/boot/sbl/src/hyperflash/sbl_hyperflash.c
index 1a6e9a0998f3c9cd732d8a58d30bf8ae7fcbd601..37e89be2ecf5ad668e16ca3af56d3c1c4f072eb2 100644 (file)
if(h)
{
SBL_ADD_PROFILE_POINT;
-
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ SBL_log(SBL_LOG_MAX, "Waiting for tifs.bin ...\n");
+#else
SBL_log(SBL_LOG_MAX, "Waiting for sysfw.bin ...\n");
-
+#endif
*pBuffer = (void *)(gBaseAddress + HYPERFLASH_OFFSET_SYSFW);
/* Update handle for later use*/
diff --git a/packages/ti/boot/sbl/src/mmcsd/sbl_mmcsd.c b/packages/ti/boot/sbl/src/mmcsd/sbl_mmcsd.c
index 6fe968d53870d239f54f92e03d9ee351f8cbd146..3fd80764146733372ea0de0c13e3c0cab808d455 100755 (executable)
int32_t SBL_ReadSysfwImage(void **pBuffer, uint32_t num_bytes)
{
int32_t retVal = CSL_PASS;
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ const TCHAR *fileName = "0:/tifs.bin";
+#else
const TCHAR *fileName = "0:/sysfw.bin";
+#endif
FIL fp = {0};
FRESULT fresult;
uint32_t bytes_read = 0;
fresult = f_open(&fp, fileName, ((BYTE)FA_READ));
if (fresult != FR_OK)
{
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ UART_printf("\n SD Boot - tifs File open fails \n");
+#else
UART_printf("\n SD Boot - sysfw File open fails \n");
+#endif
retVal = E_FAIL;
}
else
fresult = f_read(&fp, sysfw_ptr, num_bytes, &bytes_read);
if (fresult != FR_OK)
{
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ UART_printf("\n SD Boot - tifs read fails \n");
+#else
UART_printf("\n SD Boot - sysfw read fails \n");
+#endif
retVal = E_FAIL;
}
index 3e2470a09753e17a89e413f4b2a7eb03c6f3efe4..695f2786aad6795059e16c5e822c4f9fb7587ed4 100644 (file)
SBL_ADD_PROFILE_POINT;
SBL_uartInit(SBL_ROM_UART_MODULE_INPUT_CLK);
-
+#if defined(SOC_J721E) || defined(SOC_J7200)
+ SBL_log(SBL_LOG_MIN, "Waiting for tifs.bin ...\n");
+#else
SBL_log(SBL_LOG_MIN, "Waiting for sysfw.bin ...\n");
+#endif
SBL_uartXmodemRead((uint8_t *)(*pBuffer), SBL_SYSFW_MAX_SIZE);