update: delete atmosphere kips loader.kip and hoc.kip on OmniNX update

Made-with: Cursor

Makefile

@@ -46,7 +46,11 @@ LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections -Xlinker --defs
 
 ################################################################################
 
-.PHONY: all clean release
+RAMTEST_BIN := $(OUTPUTDIR)/RAM-Test.bin
+OBJS_RAMTEST := $(filter-out $(BUILDDIR)/$(TARGET)/main.o,$(OBJS)) \
+	$(BUILDDIR)/$(TARGET)/ram_test_main.o
+
+.PHONY: all clean release ram-test
 
 all: $(OUTPUTDIR)/$(OUTPUT_NAME)
 	$(eval BIN_SIZE = $(shell wc -c < $(OUTPUTDIR)/$(OUTPUT_NAME)))
@@ -56,6 +60,7 @@ all: $(OUTPUTDIR)/$(OUTPUT_NAME)
 clean:
 	@rm -rf $(BUILDDIR)
 	@rm -rf $(OUTPUTDIR)
+	@rm -f $(RAMTEST_BIN)
 	@rm -rf release
 	@rm -f $(TARGET)-*.zip
 
@@ -67,6 +72,20 @@ $(OUTPUTDIR)/$(OUTPUT_NAME): $(BUILDDIR)/$(TARGET)/$(TARGET).elf
 $(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS)
 	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
 
+$(BUILDDIR)/$(TARGET)/ram_test_main.o: tools/ram_test_main.c
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/ram_test.elf: $(OBJS_RAMTEST)
+	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
+
+$(RAMTEST_BIN): $(BUILDDIR)/$(TARGET)/ram_test.elf
+	@mkdir -p "$(@D)"
+	$(OBJCOPY) -S -O binary $< $@
+	@echo "RAM-Test payload: $(RAMTEST_BIN) ($$(wc -c < $@) bytes)"
+
+ram-test: $(RAMTEST_BIN)
+
 $(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.c
 	@mkdir -p "$(@D)"
 	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@

source/backup.c

@@ -101,3 +101,34 @@ int cleanup_backup(void) {
     }
     return FR_OK;
 }
+
+int backup_horizon_oc_config_for_oc_update(void) {
+    if (!path_exists(HORIZON_OC_CONFIG_PATH))
+        return FR_OK;
+
+    int res = f_mkdir(HORIZON_OC_UPDATE_BACKUP_DIR);
+    if (res != FR_OK && res != FR_EXIST)
+        return res;
+
+    return file_copy(HORIZON_OC_CONFIG_PATH, HORIZON_OC_UPDATE_BACKUP_INI);
+}
+
+int restore_horizon_oc_config_after_oc_update(void) {
+    if (!path_exists(HORIZON_OC_UPDATE_BACKUP_INI))
+        return FR_OK;
+
+    int res = f_mkdir("sd:/config");
+    if (res != FR_OK && res != FR_EXIST)
+        return res;
+    res = f_mkdir("sd:/config/horizon-oc");
+    if (res != FR_OK && res != FR_EXIST)
+        return res;
+
+    return file_copy(HORIZON_OC_UPDATE_BACKUP_INI, HORIZON_OC_CONFIG_PATH);
+}
+
+int cleanup_horizon_oc_update_backup(void) {
+    if (!path_exists(HORIZON_OC_UPDATE_BACKUP_DIR))
+        return FR_OK;
+    return folder_delete(HORIZON_OC_UPDATE_BACKUP_DIR);
+}

source/backup.h

@@ -8,6 +8,12 @@
 
 #define TEMP_BACKUP_PATH "sd:/temp_backup"
 
+/** Live HorizonOC settings (Overclock tool). */
+#define HORIZON_OC_CONFIG_PATH "sd:/config/horizon-oc/config.ini"
+/** Scratch dir during OC-variant update only; removed after successful restore. */
+#define HORIZON_OC_UPDATE_BACKUP_DIR "sd:/.omninx_oc_update"
+#define HORIZON_OC_UPDATE_BACKUP_INI HORIZON_OC_UPDATE_BACKUP_DIR "/config.ini"
+
 // Backup user data (DBI, Tinfoil, prod.keys) before clean install
 int backup_user_data(void);
 
@@ -16,3 +22,10 @@ int restore_user_data(void);
 
 // Clean up temporary backup directory
 int cleanup_backup(void);
+
+// HorizonOC: backup config.ini before OC pack update (update mode only); no-op if missing
+int backup_horizon_oc_config_for_oc_update(void);
+// Restore after file copy; no-op if no backup from this run
+int restore_horizon_oc_config_after_oc_update(void);
+// Delete sd:/.omninx_oc_update after successful restore
+int cleanup_horizon_oc_update_backup(void);

source/deletion_lists_clean.h

@@ -199,6 +199,8 @@ static const char* clean_switch_files_to_delete[] = {
     "sd:/switch/DBI/DBI_845_EN.nro",
     "sd:/switch/DBI/DBI_849_DE.nro",
     "sd:/switch/DBI/DBI_849_EN.nro",
+    "sd:/switch/DBI/DBI_874_DE.nro",
+    "sd:/switch/DBI/DBI_874_EN.nro",
     "sd:/switch/DBI_810_DE/DBI_810.nro",
     "sd:/switch/DBI_810_DE/DBI_810_DE.nro",
     "sd:/switch/DBI_810_EN/DBI_810_EN.nro",
@@ -270,6 +272,10 @@ static const char* clean_misc_dirs_to_delete[] = {
 
 // Miscellaneous files to delete
 static const char* clean_misc_files_to_delete[] = {
+    "sd:/TegraExplorer/scripts/Reparatur Skript fuer error 010000000000BD00.te",
+    "sd:/TegraExplorer/scripts/Reparatur Skript fuer error 0100000000001000.te",
+    "sd:/TegraExplorer/scripts/Reparatur Skript fuer error 690000000000000D.te",
+    "sd:/TegraExplorer/scripts/Reparatur Skript fuer error 4200000000000010.te",
     "sd:/fusee-primary.bin",
     "sd:/fusee.bin",
     "sd:/SaltySD/exceptions.txt",
@@ -283,13 +289,12 @@ static const char* clean_misc_files_to_delete[] = {
 
 // Old version marker files to delete (clean install only)
 static const char* old_version_files_to_delete[] = {
-    "sd:/1.0.0l",
-    "sd:/1.0.0s",
-    "sd:/1.0.0oc",
     "sd:/1.4.0-pre",
     "sd:/1.4.0-pre-c",
     "sd:/1.4.0-pre-d",
     "sd:/1.4.1",
     "sd:/1.5.0",
+    "sd:/1.6.0",
+    "sd:/1.6.1",
     NULL
 };

source/deletion_lists_update.h

@@ -80,6 +80,8 @@ static const char* atmosphere_files_to_delete[] = {
     "sd:/atmosphere/package3",
     "sd:/atmosphere/reboot_payload.bin",
     "sd:/atmosphere/stratosphere.romfs",
+    "sd:/atmosphere/kips/loader.kip",
+    "sd:/atmosphere/kips/hoc.kip",
     NULL
 };
 
@@ -172,7 +174,6 @@ static const char* switch_dirs_to_delete[] = {
     "sd:/switch/Switch-Time",
     "sd:/switch/SwitchIdent",
     "sd:/switch/Switch_themes_Installer",
-    "sd:/switch/Switchfin",
     "sd:/switch/Sys-Clk Manager",
     "sd:/switch/Sys-Con",
     "sd:/switch/sys-clk-manager",
@@ -223,9 +224,9 @@ static const char* switch_files_to_delete[] = {
     "sd:/switch/SimpleModDownloader.nro",
     "sd:/switch/SimpleModManager.nro",
     "sd:/switch/sphaira.nro",
+    "sd:/switch/swr-ini-tool/swr-ini-tool.nro",
     "sd:/switch/SwitchIdent.nro",
     "sd:/switch/Switch_themes_Installer/NXThemesInstaller.nro",
-    "sd:/switch/Switchfin.nro",
     "sd:/switch/Sys-Clk Manager/sys-clk-manager.nro",
     "sd:/switch/Sys-Con.nro",
     "sd:/switch/sys-clk-manager.nro",

source/dram_fuse.c

@@ -0,0 +1,46 @@
+/*
+ * DRAM capacity from fuse (SKU), not physical probe.
+ */
+
+#include "dram_fuse.h"
+#include <soc/fuse.h>
+#include <soc/hw_init.h>
+#include <soc/t210.h>
+
+static int mariko_dram_mib(u32 dram_id)
+{
+	switch (dram_id) {
+	case 9:
+	case 13:
+	case 18:
+	case 21:
+	case 23:
+	case 28:
+		return 8192;
+	default:
+		if (dram_id >= 3 && dram_id <= 28)
+			return 4096;
+		return -1;
+	}
+}
+
+static int erista_dram_mib(u32 dram_id)
+{
+	if (dram_id == 4)
+		return 6144;
+	if (dram_id <= 6)
+		return 4096;
+	return -1;
+}
+
+int dram_capacity_mib_from_fuse(void)
+{
+	u32 nid = fuse_read_dramid(false);
+	u32 chip = hw_get_chip_id();
+
+	if (chip == GP_HIDREV_MAJOR_T210)
+		return erista_dram_mib(nid);
+	if (chip == GP_HIDREV_MAJOR_T210B01)
+		return mariko_dram_mib(nid);
+	return -1;
+}

source/dram_fuse.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <utils/types.h>
+
+/* DRAM capacity in MiB from fuse DRAM ID + SoC (same table as RAM test payload). */
+int dram_capacity_mib_from_fuse(void);

source/install.c

@@ -3,13 +3,21 @@
  */
 
 #include "install.h"
+#include "backup.h"
 #include "fs.h"
+#include "screenshot.h"
 #include "version.h"
 #include "gfx.h"
 #include <libs/fatfs/ff.h>
+#include <input/joycon.h>
+#include <mem/heap.h>
 #include <stdarg.h>
 #include <string.h>
+#include <utils/btn.h>
+#include <utils/ini.h>
+#include <utils/list.h>
 #include <utils/sprintf.h>
+#include <utils/util.h>
 
 #define GROUPED_DELETE_MAX_ENTRIES 512
 
@@ -32,10 +40,25 @@
 #define COLOR_ORANGE  0xFF00A5FF
 #define COLOR_RED     0xFFFF0000
 
+static inline bool cancel_combo_pressed(u8 btn)
+{
+    return (btn & (BTN_VOL_UP | BTN_VOL_DOWN)) == (BTN_VOL_UP | BTN_VOL_DOWN);
+}
+
 void install_set_color(u32 color) {
     gfx_con_setcol(color, gfx_con.fillbg, gfx_con.bgcol);
 }
 
+/* Same top bar as main.c print_header() (without full screen clear). */
+static void install_print_main_header(void)
+{
+    install_set_color(COLOR_CYAN);
+    gfx_printf("===================================\n");
+    gfx_printf("  OmniNX Installer Payload v%s\n", VERSION);
+    gfx_printf("===================================\n\n");
+    install_set_color(COLOR_WHITE);
+}
+
 // Check if we need to clear screen (when getting close to bottom)
 void install_check_and_clear_screen_if_needed(void) {
     // In the gfx system:
@@ -50,13 +73,7 @@ void install_check_and_clear_screen_if_needed(void) {
         // Clear screen and reset position
         gfx_clear_grey(0x1B);
         gfx_con_setpos(0, 0);
-        
+        install_print_main_header();
-        // Reprint same header as initial launch
-        install_set_color(COLOR_CYAN);
-        gfx_printf("===================================\n");
-        gfx_printf("  OmniNX Installer Payload v%s\n", VERSION);
-        gfx_printf("===================================\n\n");
-        install_set_color(COLOR_WHITE);
     }
 }
 
@@ -618,11 +635,259 @@ int delete_path_list(const char* paths[], const char* description) {
     return (failed == 0) ? FR_OK : FR_DISK_ERR;
 }
 
+#define HEKATE_8GB_SRC   "sd:/bootloader/hekate_8gb.bin"
+#define PAYLOAD_BIN_DST  "sd:/payload.bin"
+#define UPDATE_BIN_DST   "sd:/bootloader/update.bin"
+#define RAM_CONFIG_PATH  "sd:/config/omninx/ram_config.ini"
+
+enum { RAM_READ_OK = 0, RAM_READ_NEED_MENU = 1 };
+
+static void unlink_ignore_err(const char *path)
+{
+    FILINFO fno;
+    if (f_stat(path, &fno) != FR_OK)
+        return;
+    if (fno.fattrib & AM_RDO)
+        f_chmod(path, fno.fattrib & ~AM_RDO, AM_RDO);
+    f_unlink(path);
+}
+
+static void ram_config_ensure_parent_dirs(void)
+{
+    f_mkdir("sd:/config");
+    f_mkdir("sd:/config/omninx");
+}
+
+static int ram_config_write(bool use_8gb)
+{
+    ram_config_ensure_parent_dirs();
+    FIL f;
+    if (f_open(&f, RAM_CONFIG_PATH, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)
+        return FR_DISK_ERR;
+
+    static const char sec[] = "[Ram]\n";
+    static const char line0[] = "8gb=0\n";
+    static const char line1[] = "8gb=1\n";
+    UINT bw;
+    f_write(&f, sec, sizeof(sec) - 1, &bw);
+    f_write(&f, use_8gb ? line1 : line0, sizeof(line0) - 1, &bw);
+    f_close(&f);
+    return FR_OK;
+}
+
+static void ram_config_free_sections(link_t *sections)
+{
+    LIST_FOREACH_ENTRY(ini_sec_t, sec, sections, link) {
+        LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
+            if (kv->key) free(kv->key);
+            if (kv->val) free(kv->val);
+        }
+        if (sec->name) free(sec->name);
+    }
+}
+
+/* Valid [Ram] 8gb=0|1 → silent; missing file or invalid → menu. */
+static int read_ram_config_silent(const char *path, bool *use_8gb)
+{
+    if (!install_path_exists(path))
+        return RAM_READ_NEED_MENU;
+
+    link_t sections;
+    list_init(&sections);
+
+    if (ini_parse(&sections, (char *)path, false) != 1) {
+        ram_config_free_sections(&sections);
+        return RAM_READ_NEED_MENU;
+    }
+
+    bool found = false;
+    bool eight = false;
+    LIST_FOREACH_ENTRY(ini_sec_t, sec, &sections, link) {
+        if (sec->name && !strcmp(sec->name, "Ram")) {
+            LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
+                if (kv->key && kv->val && !strcmp(kv->key, "8gb")) {
+                    if (!strcmp(kv->val, "0")) {
+                        found = true;
+                        eight = false;
+                    } else if (!strcmp(kv->val, "1")) {
+                        found = true;
+                        eight = true;
+                    }
+                    break;
+                }
+            }
+            break;
+        }
+    }
+
+    ram_config_free_sections(&sections);
+
+    if (!found)
+        return RAM_READ_NEED_MENU;
+    *use_8gb = eight;
+    return RAM_READ_OK;
+}
+
+/* Same navigation as main.c multi-variant menu; returns false if user aborts (payload/reboot). */
+static bool install_ram_config_menu(bool *use_8gb)
+{
+    jc_init_hw();
+    while (btn_read() & BTN_POWER)
+        msleep(50);
+
+    int selected = 0;
+    int prev_selected = 0;
+    bool confirmed = false;
+    const int n = 2;
+    const char *labels[2] = {
+        "4GB Konsole (Standard)",
+        "8GB Konsole",
+    };
+
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    install_print_main_header();
+
+    install_set_color(COLOR_YELLOW);
+    gfx_printf("Hekate Payload Auswahl:\n\n");
+    install_set_color(COLOR_WHITE);
+    gfx_printf("Wenn du einen 8GB RAM-Umbau hast, waehle 8GB Konsole aus.\n");
+    gfx_printf("Alle anderen waehlen 4GB Konsole aus.\n\n");
+    install_set_color(COLOR_RED);
+    gfx_printf("Warnung: Solltest du keinen RAM-Umbau haben, waehle auf keinen\n");
+    gfx_printf("Fall 8GB aus, da du sonst Boot Probleme bekommst!!!\n\n");
+    install_set_color(COLOR_WHITE);
+
+    u32 menu_x, menu_y;
+    gfx_con_getpos(&menu_x, &menu_y);
+    for (int i = 0; i < n; i++) {
+        if (i == selected) {
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  > %s\n", labels[i]);
+            install_set_color(COLOR_WHITE);
+        } else {
+            gfx_printf("    %s\n", labels[i]);
+        }
+    }
+    gfx_printf("\n");
+    install_set_color(COLOR_CYAN);
+    gfx_printf("D-Pad / Vol+/-: Auswahl  |  A oder Power: Bestaetigen\n");
+    gfx_printf("Vol+ und Vol- gleichzeitig: Abbrechen (Hekate)\n");
+    install_set_color(COLOR_WHITE);
+
+    bool prev_up = false, prev_down = false;
+    bool menu_aborted = false;
+
+    while (!confirmed && !menu_aborted) {
+        if (selected != prev_selected) {
+            gfx_con_setpos(menu_x, menu_y + (u32)prev_selected * 16);
+            install_set_color(COLOR_WHITE);
+            gfx_printf("    %s\n", labels[prev_selected]);
+            gfx_con_setpos(menu_x, menu_y + (u32)selected * 16);
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  > %s\n", labels[selected]);
+            install_set_color(COLOR_WHITE);
+            prev_selected = selected;
+        }
+
+        jc_gamepad_rpt_t *jc = joycon_poll();
+        u8 btn = btn_read();
+
+        if (jc && jc->cap)
+            take_screenshot();
+
+        if (cancel_combo_pressed(btn)) {
+            menu_aborted = true;
+            break;
+        }
+
+        bool cur_up = false, cur_down = false;
+        if (jc) {
+            cur_up = (jc->up != 0) && !jc->down;
+            cur_down = (jc->down != 0) && !jc->up;
+        }
+        if (btn & BTN_VOL_UP)
+            cur_up = true;
+        if (btn & BTN_VOL_DOWN)
+            cur_down = true;
+
+        if (cur_up && !prev_up)
+            selected = (selected - 1 + n) % n;
+        else if (cur_down && !prev_down)
+            selected = (selected + 1) % n;
+        else if (jc && jc->a)
+            confirmed = true;
+
+        prev_up = cur_up;
+        prev_down = cur_down;
+
+        if (btn & BTN_POWER)
+            confirmed = true;
+
+        msleep(50);
+    }
+
+    if (menu_aborted) {
+        gfx_printf("\n");
+        install_set_color(COLOR_YELLOW);
+        gfx_printf("Abgebrochen. Starte Hekate...\n");
+        install_set_color(COLOR_WHITE);
+        msleep(500);
+        installer_launch_hekate_payload();
+        return false;
+    }
+
+    *use_8gb = (selected == 1);
+    ram_config_write(*use_8gb);
+
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    install_print_main_header();
+    return true;
+}
+
+/* After pack copy: use ram_config.ini [Ram] 8gb=0|1 if present; else menu, write file, then apply. No fuse autodetect. */
+static void install_hekate_8gb_post_copy(void)
+{
+    if (!install_path_exists(HEKATE_8GB_SRC))
+        return;
+
+    bool use_8gb;
+    if (read_ram_config_silent(RAM_CONFIG_PATH, &use_8gb) != RAM_READ_OK) {
+        if (!install_ram_config_menu(&use_8gb))
+            return;
+    }
+
+    if (use_8gb) {
+        int r1 = file_copy(HEKATE_8GB_SRC, PAYLOAD_BIN_DST);
+        int r2 = file_copy(HEKATE_8GB_SRC, UPDATE_BIN_DST);
+        if (r1 == FR_OK && r2 == FR_OK)
+            unlink_ignore_err(HEKATE_8GB_SRC);
+    } else {
+        unlink_ignore_err(HEKATE_8GB_SRC);
+    }
+}
+
 // Main installation function
 int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
     int res;
     
     if (mode == INSTALL_MODE_UPDATE) {
+        if (pack_variant == VARIANT_OC) {
+            bool had_horizon_cfg = install_path_exists(HORIZON_OC_CONFIG_PATH);
+            install_set_color(COLOR_YELLOW);
+            gfx_printf("HorizonOC: Sichere config.ini...\n");
+            install_set_color(COLOR_WHITE);
+            res = backup_horizon_oc_config_for_oc_update();
+            if (res != FR_OK)
+                return res;
+            if (had_horizon_cfg) {
+                install_set_color(COLOR_GREEN);
+                gfx_printf("  [OK] Bestehende config.ini gesichert.\n");
+                install_set_color(COLOR_WHITE);
+            }
+        }
+
         // Update mode: selective cleanup then install
         install_set_color(COLOR_YELLOW);
         gfx_printf("Schritt 1: Bereinigung...\n");
@@ -638,6 +903,28 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
         res = update_mode_install(pack_variant);
         if (res != FR_OK) return res;
 
+        install_hekate_8gb_post_copy();
+
+        if (pack_variant == VARIANT_OC) {
+            bool had_horizon_bak = install_path_exists(HORIZON_OC_UPDATE_BACKUP_INI);
+            install_check_and_clear_screen_if_needed();
+            install_set_color(COLOR_YELLOW);
+            gfx_printf("HorizonOC: Stelle config.ini wieder her...\n");
+            install_set_color(COLOR_WHITE);
+            res = restore_horizon_oc_config_after_oc_update();
+            if (res != FR_OK)
+                return res;
+            install_set_color(COLOR_GREEN);
+            if (had_horizon_bak)
+                gfx_printf("  [OK] Deine HorizonOC-Einstellungen wurden wiederhergestellt.\n");
+            else
+                gfx_printf("  [OK] Keine fruehere config.ini — Standard aus dem Paket bleibt.\n");
+            install_set_color(COLOR_WHITE);
+            res = cleanup_horizon_oc_update_backup();
+            if (res != FR_OK)
+                return res;
+        }
+
         install_check_and_clear_screen_if_needed();
         // Remove staging directory (installed pack)
         res = cleanup_staging_directory(pack_variant);
@@ -677,6 +964,8 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
         res = clean_mode_install(pack_variant);
         if (res != FR_OK) return res;
 
+        install_hekate_8gb_post_copy();
+
         install_check_and_clear_screen_if_needed();
         // Remove staging directory (installed pack)
         res = cleanup_staging_directory(pack_variant);

source/install.h

@@ -13,6 +13,9 @@ typedef enum {
     INSTALL_MODE_CLEAN     // No OmniNX - selective deletion from clean list
 } install_mode_t;
 
+// If a sub-menu aborts to Hekate / update.bin (does not return if launch succeeds)
+void installer_launch_hekate_payload(void);
+
 // Main installation function
 int perform_installation(omninx_variant_t pack_variant, install_mode_t mode);
 

source/main.c

@@ -116,6 +116,12 @@ static void print_header(void) {
     set_color(COLOR_WHITE);
 }
 
+/* Console Vol+ and Vol- together (exit / cancel where documented) */
+static inline bool cancel_combo_pressed(u8 btn)
+{
+    return (btn & (BTN_VOL_UP | BTN_VOL_DOWN)) == (BTN_VOL_UP | BTN_VOL_DOWN);
+}
+
 
 void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size) {
     memcpy((u8 *)payload_src, (u8 *)IPL_LOAD_ADDR, PATCHED_RELOC_SZ);
@@ -183,6 +189,12 @@ static int file_exists(const char *path) {
     return (f_stat(path, &fno) == FR_OK);
 }
 
+void installer_launch_hekate_payload(void) {
+    if (file_exists(PAYLOAD_PATH))
+        launch_payload(PAYLOAD_PATH);
+    power_set_state(POWER_OFF_REBOOT);
+}
+
 extern void pivot_stack(u32 stack_top);
 
 void ipl_main(void) {
@@ -244,11 +256,13 @@ void ipl_main(void) {
             set_color(COLOR_GREEN);
             gfx_printf("Druecke A-Taste (rechter Joy-Con) oder Power-Taste,\n");
             gfx_printf("um Hekate zu starten...\n");
+            gfx_printf("Oder Vol+ und Vol- (Konsole) gleichzeitig.\n");
             set_color(COLOR_WHITE);
         } else {
             set_color(COLOR_GREEN);
             gfx_printf("Druecke A-Taste (rechter Joy-Con) oder Power-Taste,\n");
             gfx_printf("um den Neustart zu starten...\n");
+            gfx_printf("Oder Vol+ und Vol- (Konsole) gleichzeitig.\n");
             set_color(COLOR_WHITE);
         }
         
@@ -275,6 +289,10 @@ void ipl_main(void) {
                     break;
                 }
             }
+            if (cancel_combo_pressed(btn_state)) {
+                button_pressed = true;
+                break;
+            }
 
             msleep(50); // Small delay to avoid busy-waiting
         }
@@ -329,12 +347,14 @@ void ipl_main(void) {
         gfx_printf("\n");
         set_color(COLOR_CYAN);
         gfx_printf("D-Pad / Vol+/-: Auswahl  |  A oder Power: Bestaetigen\n");
+        gfx_printf("Vol+ und Vol- gleichzeitig: Abbrechen (Hekate)\n");
         set_color(COLOR_WHITE);
         
         // Edge detection: only move on press (not while held)
         bool prev_up = false, prev_down = false;
+        bool menu_aborted = false;
         
-        while (!confirmed) {
+        while (!confirmed && !menu_aborted) {
             // On selection change: redraw only the two affected lines (no full clear)
             if (selected != prev_selected) {
                 gfx_con_setpos(menu_x, menu_variant_start_y + (u32)prev_selected * 16);
@@ -353,6 +373,11 @@ void ipl_main(void) {
             if (jc && jc->cap)
                 take_screenshot();
 
+            if (cancel_combo_pressed(btn)) {
+                menu_aborted = true;
+                break;
+            }
+            
             // D-pad or Vol+ / Vol- for selection (Vol+ = up, Vol- = down)
             bool cur_up = false, cur_down = false;
             if (jc) {
@@ -378,6 +403,20 @@ void ipl_main(void) {
             msleep(50);
         }
 
+        if (menu_aborted) {
+            gfx_printf("\n");
+            set_color(COLOR_YELLOW);
+            gfx_printf("Abgebrochen. Starte Hekate...\n");
+            set_color(COLOR_WHITE);
+            msleep(500);
+            if (file_exists(PAYLOAD_PATH)) {
+                launch_payload(PAYLOAD_PATH);
+            } else {
+                power_set_state(POWER_OFF_REBOOT);
+            }
+            return;
+        }
+        
         pack_variant = variants_present[selected];
         gfx_clear_grey(0x1B);
         print_header();
@@ -403,20 +442,21 @@ void ipl_main(void) {
         gfx_printf("mit angeschlossenem Ladegeraet durchgefuehrt werden.\n\n");
         set_color(COLOR_YELLOW);
         gfx_printf("Stecke das Ladegeraet an und warte...\n");
-        gfx_printf("Oder druecke + und - zum Abbrechen.\n");
+        gfx_printf("Oder Vol+ und Vol- (Konsole) zum Abbrechen.\n");
         set_color(COLOR_WHITE);
         jc_init_hw();
         while (btn_read() & BTN_POWER) { msleep(50); }
         bool user_cancelled = false;
         while (batt_pct < BATT_LOW_THRESHOLD && !bq24193_charger_connected() && !user_cancelled) {
+            u8 pbtn = btn_read();
             jc_gamepad_rpt_t *jc = joycon_poll();
             if (jc) {
                 if (jc->cap)
                     take_screenshot();
-                if (jc->plus && jc->minus) {
+            }
-                    user_cancelled = true;
+            if (cancel_combo_pressed(pbtn)) {
-                    break;
+                user_cancelled = true;
-                }
+                break;
             }
             if (max17050_get_property(MAX17050_RepSOC, &batt_raw) == 0) {
                 batt_pct = batt_raw >> 8;
@@ -473,10 +513,13 @@ void ipl_main(void) {
         gfx_printf("Empfohlene Karten: Samsung EVO Plus, EVO Select und PRO Plus.\n\n");
         set_color(COLOR_GREEN);
         gfx_printf("Druecke A (oder Power), um trotzdem fortzufahren.\n");
+        set_color(COLOR_CYAN);
+        gfx_printf("Vol+ und Vol- (Konsole) gleichzeitig: Abbrechen -> Hekate.\n");
         set_color(COLOR_WHITE);
         while (btn_read() & BTN_POWER) { msleep(50); }
         bool acknowledged = false;
-        while (!acknowledged) {
+        bool uhs_aborted = false;
+        while (!acknowledged && !uhs_aborted) {
             u8 btn_state = btn_read();
             if (btn_state & BTN_POWER) acknowledged = true;
             jc_gamepad_rpt_t *jc = joycon_poll();
@@ -485,8 +528,22 @@ void ipl_main(void) {
                     take_screenshot();
                 if (jc->a) acknowledged = true;
             }
+            if (cancel_combo_pressed(btn_state)) {
+                uhs_aborted = true;
+                break;
+            }
             msleep(50);
         }
+        if (uhs_aborted) {
+            gfx_printf("\nAbgebrochen. Starte Hekate...\n");
+            msleep(500);
+            if (file_exists(PAYLOAD_PATH)) {
+                launch_payload(PAYLOAD_PATH);
+            } else {
+                power_set_state(POWER_OFF_REBOOT);
+            }
+            return;
+        }
         // Wait for A and Power to be released so the same press doesn't start the install
         while (btn_read() & BTN_POWER) { msleep(50); }
         bool released = false;
@@ -526,7 +583,7 @@ void ipl_main(void) {
     gfx_printf("um die Installation zu starten...\n");
     set_color(COLOR_WHITE);
     set_color(COLOR_CYAN);
-    gfx_printf("Druecke + und - gleichzeitig zum Abbrechen (zurueck zu Hekate).\n");
+    gfx_printf("Vol+ und Vol- (Konsole) gleichzeitig: Abbrechen -> Hekate.\n");
     set_color(COLOR_WHITE);
     
     // Wait for A/Power to start, or +/- to cancel
@@ -555,11 +612,10 @@ void ipl_main(void) {
                 button_pressed = true;
                 break;
             }
-            // + and - simultaneously = cancel, return to hekate
+        }
-            if (jc->plus && jc->minus) {
+        if (cancel_combo_pressed(btn_state)) {
-                cancelled = true;
+            cancelled = true;
-                break;
+            break;
-            }
         }
         
         msleep(50); // Small delay to avoid busy-waiting

tools/ram_test_main.c

@@ -0,0 +1,70 @@
+/*
+ * Minimal RAM info test payload (fuse DRAM ID + SK table -> MiB).
+ * Build: make ram-test  ->  output/RAM-Test.bin
+ */
+
+#include <display/di.h>
+#include <mem/heap.h>
+#include <mem/minerva.h>
+#include <memory_map.h>
+#include <soc/bpmp.h>
+#include <soc/fuse.h>
+#include <soc/hw_init.h>
+#include <soc/t210.h>
+#include <utils/util.h>
+
+#include "dram_fuse.h"
+#include "gfx.h"
+
+#undef COLOR_CYAN
+#undef COLOR_WHITE
+#define COLOR_CYAN   0xFF00FFFF
+#define COLOR_WHITE  0xFFFFFFFF
+
+/* Required by BDK */
+boot_cfg_t __attribute__((section("._boot_cfg"))) b_cfg;
+volatile nyx_storage_t *nyx_str = (nyx_storage_t *)NYX_STORAGE_ADDR;
+
+extern void pivot_stack(u32 stack_top);
+
+void ipl_main(void)
+{
+	hw_init();
+	pivot_stack(IPL_STACK_TOP);
+	heap_init(IPL_HEAP_START);
+
+	minerva_init();
+	minerva_change_freq(FREQ_800);
+
+	display_init();
+	u32 *fb = display_init_framebuffer_pitch();
+	gfx_init_ctxt(fb, 720, 1280, 720);
+	gfx_con_init();
+	display_backlight_pwm_init();
+	display_backlight_brightness(100, 1000);
+
+	bpmp_clk_rate_set(BPMP_CLK_DEFAULT_BOOST);
+
+	gfx_clear_grey(0x1B);
+	gfx_con_setpos(0, 0);
+	gfx_con_setcol(COLOR_CYAN, gfx_con.fillbg, gfx_con.bgcol);
+	gfx_printf("RAM test payload\n\n");
+	gfx_con_setcol(COLOR_WHITE, gfx_con.fillbg, gfx_con.bgcol);
+
+	u32 raw = fuse_read_dramid(true);
+	u32 nid = fuse_read_dramid(false);
+	u32 chip = hw_get_chip_id();
+	int mib = dram_capacity_mib_from_fuse();
+
+	gfx_printf("SoC:       %s\n", chip == GP_HIDREV_MAJOR_T210B01 ? "Mariko (T210B01)" : "Erista (T210)");
+	gfx_printf("DRAM fuse: raw %d  norm %d\n", raw, nid);
+	if (mib > 0)
+		gfx_printf("Table MiB: %d (fuse SKU, not probe)\n", mib);
+	else
+		gfx_printf("Table MiB: (unknown id for this SoC)\n");
+
+	gfx_printf("\nHang — power off or inject payload.\n");
+
+	while (1)
+		msleep(500);
+}