From 4d8dbe068d715df98c1431829c0da6eb9d6283e5 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Sun, 14 Jun 2020 13:25:08 +0300 Subject: [PATCH] sept: Remove support for obsolete no _00/01 suffix --- bootloader/hos/sept.c | 4 +--- nyx/nyx_gui/hos/sept.c | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bootloader/hos/sept.c b/bootloader/hos/sept.c index 287be1b..cbc6434 100644 --- a/bootloader/hos/sept.c +++ b/bootloader/hos/sept.c @@ -107,7 +107,6 @@ void check_sept(ini_sec_t *cfg_sec) const pkg1_id_t *pkg1_id = pkg1_identify(pkg1); if (!pkg1_id) { - gfx_con.fntsz = 16; EPRINTF("Unknown pkg1 version."); goto out_free; } @@ -172,8 +171,7 @@ int reboot_to_sept(const u8 *tsec_fw, u32 kb, ini_sec_t *cfg_sec) if (kb < KB_FIRMWARE_VERSION_810) { if (f_open(&fp, "sept/sept-secondary_00.enc", FA_READ)) - if (f_open(&fp, "sept/sept-secondary.enc", FA_READ)) // Try the deprecated version. - goto error; + goto error; } else { diff --git a/nyx/nyx_gui/hos/sept.c b/nyx/nyx_gui/hos/sept.c index 0f1519f..d429033 100644 --- a/nyx/nyx_gui/hos/sept.c +++ b/nyx/nyx_gui/hos/sept.c @@ -93,6 +93,7 @@ void check_sept() EPRINTF("Failed to init eMMC."); goto out_free; } + sdmmc_storage_set_mmc_partition(&storage, EMMC_BOOT0); // Read package1. @@ -102,7 +103,6 @@ void check_sept() free(build_date); if (!pkg1_id) { - gfx_con.fntsz = 16; EPRINTF("Unknown pkg1 version."); goto out_free; } @@ -153,8 +153,7 @@ int reboot_to_sept(const u8 *tsec_fw, u32 kb) if (kb < KB_FIRMWARE_VERSION_810) { if (f_open(&fp, "sept/sept-secondary_00.enc", FA_READ)) - if (f_open(&fp, "sept/sept-secondary.enc", FA_READ)) // Try the deprecated version. - goto error; + goto error; } else {