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

hekate/nyx: push some missed changes

Browse source
This commit is contained in:
CTCaer 2022-07-01 11:33:43 +03:00
parent 535ea95086
commit fe7fd6370e
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootloader/hos/hos.c
View file

@ -997,7 +997,7 @@ int hos_launch(ini_sec_t *cfg)
kernel_patch_t *kernel_patchset = ctxt.pkg2_kernel_id->kernel_patchset; kernel_patch_t *kernel_patchset = ctxt.pkg2_kernel_id->kernel_patchset;
if (kernel_patchset != NULL) if (kernel_patchset != NULL)
{ {
gfx_printf("%kPatching kernel%k\n", 0xFFFFBA00, 0xFFCCCCCC); gfx_printf("%kPatching kernel%k\n", TXT_CLR_ORANGE, TXT_CLR_DEFAULT);
u32 *temp; u32 *temp;
for (u32 i = 0; kernel_patchset[i].id != 0xFFFFFFFF; i++) for (u32 i = 0; kernel_patchset[i].id != 0xFFFFFFFF; i++)
{ {
@ -1038,7 +1038,7 @@ int hos_launch(ini_sec_t *cfg)
// Patch kip1s in memory if needed. // Patch kip1s in memory if needed.
if (ctxt.kip1_patches) if (ctxt.kip1_patches)
gfx_printf("%kPatching kips%k\n", 0xFFFFBA00, 0xFFCCCCCC); gfx_printf("%kPatching kips%k\n", TXT_CLR_ORANGE, TXT_CLR_DEFAULT);
const char* unappliedPatch = pkg2_patch_kips(&kip1_info, ctxt.kip1_patches); const char* unappliedPatch = pkg2_patch_kips(&kip1_info, ctxt.kip1_patches);
if (unappliedPatch != NULL) if (unappliedPatch != NULL)
{ {
@ -1069,7 +1069,7 @@ int hos_launch(ini_sec_t *cfg)
sd_end(); sd_end();
sdmmc_storage_end(&emmc_storage); sdmmc_storage_end(&emmc_storage);
gfx_printf("Rebuilt & loaded pkg2\n\n%kBooting...%k\n", 0xFF96FF00, 0xFFCCCCCC); gfx_printf("Rebuilt & loaded pkg2\n\n%kBooting...%k\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT);
// Clear pkg1/pkg2 keys. // Clear pkg1/pkg2 keys.
se_aes_key_clear(8); se_aes_key_clear(8);

1
nyx/nyx_gui/frontend/gui.h
View file

@ -42,7 +42,6 @@ typedef struct _gui_status_bar_ctx
lv_obj_t *temp_degrees; lv_obj_t *temp_degrees;
lv_obj_t *battery; lv_obj_t *battery;
lv_obj_t *battery_more; lv_obj_t *battery_more;
lv_obj_t *monitor;
} gui_status_bar_ctx; } gui_status_bar_ctx;
extern lv_style_t hint_small_style; extern lv_style_t hint_small_style;

2
nyx/nyx_gui/nyx.c
View file

@ -103,7 +103,7 @@ create_dir:
#define EXT_PAYLOAD_ADDR 0xC0000000 #define EXT_PAYLOAD_ADDR 0xC0000000
#define RCM_PAYLOAD_ADDR (EXT_PAYLOAD_ADDR + ALIGN(PATCHED_RELOC_SZ, 0x10)) #define RCM_PAYLOAD_ADDR (EXT_PAYLOAD_ADDR + ALIGN(PATCHED_RELOC_SZ, 0x10))
#define COREBOOT_END_ADDR 0xD0000000 #define COREBOOT_END_ADDR 0xD0000000
#define CBFS_DRAM_EN_ADDR 0x4003e000 #define CBFS_DRAM_EN_ADDR 0x4003E000
#define CBFS_DRAM_MAGIC 0x4452414D // "DRAM" #define CBFS_DRAM_MAGIC 0x4452414D // "DRAM"
static void *coreboot_addr; static void *coreboot_addr;