nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 19:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

l4t: adjust revision amidst the new changes

Browse source 
Also add helpful message if files are missing.
This commit is contained in:
CTCaer 2023-06-09 10:56:39 +03:00
parent 84822726cb
commit 66e5e128f6
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bootloader/l4t/l4t.c
View file

@ -33,6 +33,7 @@
* 1: SDMMC1 LA programming for SDMMC1 UHS DDR200. * 1: SDMMC1 LA programming for SDMMC1 UHS DDR200.
*/ */
#define L4T_LOADER_API_REV 1 #define L4T_LOADER_API_REV 1
#define L4T_FIRMWARE_REV 0x32524556 // REV2.
#ifdef DEBUG_UART_PORT #ifdef DEBUG_UART_PORT
#include <soc/uart.h> #include <soc/uart.h>
@ -329,10 +330,11 @@ enum {
BPMPFW_B01_MTC_TBL = 7 BPMPFW_B01_MTC_TBL = 7
}; };
static void _l4t_crit_error(const char *text) static void _l4t_crit_error(const char *text, bool needs_update)
{ {
gfx_con.mute = false; gfx_con.mute = false;
gfx_printf("%kL4T Error: %s!\nFailed to launch L4T!\n%k", TXT_CLR_ERROR, text, TXT_CLR_DEFAULT); gfx_printf("%kL4T Error: %s!%sFailed to launch L4T!\n%k",
TXT_CLR_ERROR, text, needs_update ? "\nUpdate bootloader folder!\n\n" : "\n\n", TXT_CLR_DEFAULT);
} }
char *sd_path; char *sd_path;
@ -356,6 +358,10 @@ static int _l4t_sd_load(u32 idx)
f_close(&fp); f_close(&fp);
u32 rev = *(u32 *)(load_address + size - sizeof(u32));
if (idx >= SC7ENTRY_FW && rev != L4T_FIRMWARE_REV)
return 0;
return size; return size;
} }
@ -1006,7 +1012,7 @@ void launch_l4t(const ini_sec_t *ini_sec, int entry_idx, int is_list, bool t210b
if (!ctxt.path) if (!ctxt.path)
{ {
_l4t_crit_error("Path missing"); _l4t_crit_error("Path missing", false);
return; return;
} }
@ -1014,28 +1020,28 @@ void launch_l4t(const ini_sec_t *ini_sec, int entry_idx, int is_list, bool t210b
ctxt.mtc_table = minerva_get_mtc_table(); ctxt.mtc_table = minerva_get_mtc_table();
if (!t210b01 && !ctxt.mtc_table) if (!t210b01 && !ctxt.mtc_table)
{ {
_l4t_crit_error("Minerva missing"); _l4t_crit_error("Minerva missing", true);
return; return;
} }
// U-BOOT does not support exfat. // U-BOOT does not support exfat.
if (sd_fs.fs_type == FS_EXFAT) if (sd_fs.fs_type == FS_EXFAT)
{ {
_l4t_crit_error("exFAT not supported"); _l4t_crit_error("exFAT not supported", false);
return; return;
} }
// Load BL31 (ATF/TrustZone fw). // Load BL31 (ATF/TrustZone fw).
if (!_l4t_sd_load(BL31_FW)) if (!_l4t_sd_load(BL31_FW))
{ {
_l4t_crit_error("BL31 missing"); _l4t_crit_error("BL31 missing", false);
return; return;
} }
// Load BL33 (U-BOOT/CBOOT). // Load BL33 (U-BOOT/CBOOT).
if (!_l4t_sd_load(BL33_FW)) if (!_l4t_sd_load(BL33_FW))
{ {
_l4t_crit_error("BL33 missing"); _l4t_crit_error("BL33 missing", false);
return; return;
} }
@ -1049,30 +1055,30 @@ void launch_l4t(const ini_sec_t *ini_sec, int entry_idx, int is_list, bool t210b
ctxt.sc7entry_size = _l4t_sd_load(SC7ENTRY_FW); ctxt.sc7entry_size = _l4t_sd_load(SC7ENTRY_FW);
if (!ctxt.sc7entry_size) if (!ctxt.sc7entry_size)
{ {
_l4t_crit_error("SC7-Entry missing"); _l4t_crit_error("loading SC7-Entry", true);
return; return;
} }
// Load BPMP-FW. Does power management. // Load BPMP-FW. Does power management.
if (!_l4t_sd_load(BPMPFW_FW)) if (!_l4t_sd_load(BPMPFW_FW))
{ {
_l4t_crit_error("BPMP-FW missing"); _l4t_crit_error("loading BPMP-FW", true);
return; return;
} }
} }
else else
{ {
// Load BPMP-FW. Manages SC7-Entry also. // Load BPMP-FW. Manages SC7-Entry also.
if (!_l4t_sd_load(BPMPFW_FW)) if (!_l4t_sd_load(BPMPFW_B01_FW))
{ {
_l4t_crit_error("BPMP-FW missing"); _l4t_crit_error("loading BPMP-FW", true);
return; return;
} }
// Load BPMP-FW MTC table. // Load BPMP-FW MTC table.
if (!_l4t_sd_load(BPMPFW_MTC_TBL)) if (!_l4t_sd_load(BPMPFW_B01_MTC_TBL))
{ {
_l4t_crit_error("BPMP-FW MTC missing"); _l4t_crit_error("loading BPMP-FW MTC", true);
return; return;
} }
} }
@ -1080,7 +1086,7 @@ void launch_l4t(const ini_sec_t *ini_sec, int entry_idx, int is_list, bool t210b
// Load SC7-Exit firmware. // Load SC7-Exit firmware.
if (!_l4t_sd_load(!t210b01 ? SC7EXIT_FW : SC7EXIT_B01_FW)) if (!_l4t_sd_load(!t210b01 ? SC7EXIT_FW : SC7EXIT_B01_FW))
{ {
_l4t_crit_error("SC7-Exit missing"); _l4t_crit_error("loading SC7-Exit", true);
return; return;
} }