diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c index ab4488b..f36e362 100644 --- a/bootloader/hos/hos.c +++ b/bootloader/hos/hos.c @@ -968,10 +968,6 @@ int hos_launch(ini_sec_t *cfg) gfx_printf("\n%kBooting...%k\n", 0xFF96FF00, 0xFFCCCCCC); - // Clear pkg1/pkg2 keys. - se_aes_key_clear(8); - se_aes_key_clear(11); - // Set initial mailbox values. int bootStateDramPkg2 = 0; int bootStatePkg2Continue = 0; @@ -982,6 +978,10 @@ int hos_launch(ini_sec_t *cfg) else if (kb == KB_FIRMWARE_VERSION_301) PMC(APBDEV_PMC_SECURE_SCRATCH32) = 0x104; // Warmboot 3.0.1/.2 PA address id. + // Clear pkg1/pkg2 keys. + se_aes_key_clear(8); + se_aes_key_clear(11); + // Finalize per firmware key access. Skip access control if new exosphere. switch (kb | (exo_new << 7)) { diff --git a/bootloader/main.c b/bootloader/main.c index ab36a3e..f11bf02 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -787,8 +787,6 @@ static void _auto_launch_firmware() EMC(EMC_SCRATCH0) |= EMC_HEKA_UPD; check_sept(NULL); } - else if (b_cfg.extra_cfg & EXTRA_CFG_NYX_UMS) - EMC(EMC_SCRATCH0) |= EMC_HEKA_UPD; if (!h_cfg.sept_run) auto_launch_update(); diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index af91d6c..321d173 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -1462,9 +1462,10 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) lv_obj_t * lb_val3 = lv_label_create(val3, lb_desc); - s_printf(txt_buf, "\n%s\n%d KiB\n%d MiB", + s_printf(txt_buf, "\n%s\n%d %s\n%d MiB", sd_fs.fs_type == FS_EXFAT ? ("exFAT "SYMBOL_SHRK) : ("FAT32"), (sd_fs.csize > 1) ? (sd_fs.csize >> 1) : 512, + (sd_fs.csize > 1) ? "KiB" : "B", sd_fs.free_clst * sd_fs.csize >> SECTORS_TO_MIB_COEFF); lv_label_set_text(lb_val3, txt_buf); diff --git a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c index f0befa3..319ce18 100644 --- a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c +++ b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c @@ -912,7 +912,7 @@ static lv_res_t _action_flash_android_data(lv_obj_t * btns, const char * txt) lv_obj_set_size(dark_bg, LV_HOR_RES, LV_VER_RES); static const char *mbox_btn_map[] = { "\211", "\222OK", "\211", "" }; - static const char *mbox_btn_map2[] = { "\222Continue", "\222Cancel", "" }; + static const char *mbox_btn_map2[] = { "\222Continue", "\222No", "" }; lv_obj_t *mbox = lv_mbox_create(dark_bg, NULL); lv_mbox_set_recolor_text(mbox, true); lv_obj_set_width(mbox, LV_HOR_RES / 9 * 6);