Input: console Vol+/- combo only before install; Joy-Con +/- exit removed

- cancel_combo_pressed uses only hardware volume buttons
- After installation summary and payload-missing screen: A or Power only

Made-with: Cursor

Makefile

@@ -1,90 +1,109 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
-
+
-ifeq ($(strip $(DEVKITARM)),)
+ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-endif
+endif
-
+
-include $(DEVKITARM)/base_rules
+include $(DEVKITARM)/base_rules
-
+
-################################################################################
+################################################################################
-
+
-IPL_LOAD_ADDR := 0x40008000
+IPL_LOAD_ADDR := 0x40008000
-VERSION := $(shell cat VERSION)
+VERSION := $(shell cat VERSION)
-
+
-################################################################################
+################################################################################
-
+
-TARGET := omninx-installer
+TARGET := omninx-installer
-OUTPUT_NAME := OmniNX-Installer.bin
+OUTPUT_NAME := OmniNX-Installer.bin
-BUILDDIR := build
+BUILDDIR := build
-OUTPUTDIR := output
+OUTPUTDIR := output
-SOURCEDIR := source
+SOURCEDIR := source
-BDKDIR := bdk
+BDKDIR := bdk
-BDKINC := -I./$(BDKDIR)
+BDKINC := -I./$(BDKDIR)
-VPATH = $(dir ./$(SOURCEDIR)/) $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
+VPATH = $(dir ./$(SOURCEDIR)/) $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
-VPATH += $(dir $(wildcard ./$(BDKDIR)/)) $(dir $(wildcard ./$(BDKDIR)/*/)) $(dir $(wildcard ./$(BDKDIR)/*/*/))
+VPATH += $(dir $(wildcard ./$(BDKDIR)/)) $(dir $(wildcard ./$(BDKDIR)/*/)) $(dir $(wildcard ./$(BDKDIR)/*/*/))
-
+
-# All source files
+# All source files
-OBJS = $(patsubst $(SOURCEDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
+OBJS = $(patsubst $(SOURCEDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(patsubst $(SOURCEDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
+		$(patsubst $(SOURCEDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(call rwildcard, $(SOURCEDIR), *.S *.c)))
+		$(call rwildcard, $(SOURCEDIR), *.S *.c)))
-OBJS += $(patsubst $(BDKDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
+OBJS += $(patsubst $(BDKDIR)/%.S, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(patsubst $(BDKDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
+		$(patsubst $(BDKDIR)/%.c, $(BUILDDIR)/$(TARGET)/%.o, \
-		$(call rwildcard, $(BDKDIR), *.S *.c)))
+		$(call rwildcard, $(BDKDIR), *.S *.c)))
-
+
-GFX_INC   := '"../$(SOURCEDIR)/gfx.h"'
+GFX_INC   := '"../$(SOURCEDIR)/gfx.h"'
-FFCFG_INC := '"../$(SOURCEDIR)/libs/fatfs/ffconf.h"'
+FFCFG_INC := '"../$(SOURCEDIR)/libs/fatfs/ffconf.h"'
-
+
-################################################################################
+################################################################################
-
+
-CUSTOMDEFINES := -DIPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
+CUSTOMDEFINES := -DIPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
-CUSTOMDEFINES += -DGFX_INC=$(GFX_INC) -DFFCFG_INC=$(FFCFG_INC)
+CUSTOMDEFINES += -DGFX_INC=$(GFX_INC) -DFFCFG_INC=$(FFCFG_INC)
-CUSTOMDEFINES += -DVERSION='"$(VERSION)"'
+CUSTOMDEFINES += -DVERSION='"$(VERSION)"'
-
+
-ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
+ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-CFLAGS = $(ARCH) -Os -nostdlib -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-inline -std=gnu11 -Wall -Wno-missing-braces $(CUSTOMDEFINES)
+CFLAGS = $(ARCH) -Os -nostdlib -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-inline -std=gnu11 -Wall -Wno-missing-braces $(CUSTOMDEFINES)
-LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections -Xlinker --defsym=IPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
+LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections -Xlinker --defsym=IPL_LOAD_ADDR=$(IPL_LOAD_ADDR)
-
+
-################################################################################
+################################################################################
-
+
-.PHONY: all clean release
+RAMTEST_BIN := $(OUTPUTDIR)/RAM-Test.bin
-
+OBJS_RAMTEST := $(filter-out $(BUILDDIR)/$(TARGET)/main.o,$(OBJS)) \
-all: $(OUTPUTDIR)/$(OUTPUT_NAME)
+	$(BUILDDIR)/$(TARGET)/ram_test_main.o
-	$(eval BIN_SIZE = $(shell wc -c < $(OUTPUTDIR)/$(OUTPUT_NAME)))
+
-	@echo "Payload size is $(BIN_SIZE) bytes"
+.PHONY: all clean release ram-test
-	@echo "Max size is 126296 bytes."
+
-
+all: $(OUTPUTDIR)/$(OUTPUT_NAME)
-clean:
+	$(eval BIN_SIZE = $(shell wc -c < $(OUTPUTDIR)/$(OUTPUT_NAME)))
-	@rm -rf $(BUILDDIR)
+	@echo "Payload size is $(BIN_SIZE) bytes"
-	@rm -rf $(OUTPUTDIR)
+	@echo "Max size is 126296 bytes."
-	@rm -rf release
+
-	@rm -f $(TARGET)-*.zip
+clean:
-
+	@rm -rf $(BUILDDIR)
-$(OUTPUTDIR)/$(OUTPUT_NAME): $(BUILDDIR)/$(TARGET)/$(TARGET).elf
+	@rm -rf $(OUTPUTDIR)
-	@mkdir -p "$(@D)"
+	@rm -f $(RAMTEST_BIN)
-	$(OBJCOPY) -S -O binary $< $(OUTPUTDIR)/$(TARGET).bin
+	@rm -rf release
-	@mv $(OUTPUTDIR)/$(TARGET).bin $(OUTPUTDIR)/$(OUTPUT_NAME)
+	@rm -f $(TARGET)-*.zip
-
+
-$(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS)
+$(OUTPUTDIR)/$(OUTPUT_NAME): $(BUILDDIR)/$(TARGET)/$(TARGET).elf
-	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
+	@mkdir -p "$(@D)"
-
+	$(OBJCOPY) -S -O binary $< $(OUTPUTDIR)/$(TARGET).bin
-$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.c
+	@mv $(OUTPUTDIR)/$(TARGET).bin $(OUTPUTDIR)/$(OUTPUT_NAME)
-	@mkdir -p "$(@D)"
+
-	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+$(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS)
-
+	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
-$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.S
+
-	@mkdir -p "$(@D)"
+$(BUILDDIR)/$(TARGET)/ram_test_main.o: tools/ram_test_main.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	@mkdir -p "$(@D)"
-
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
-$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.c
+
-	@mkdir -p "$(@D)"
+$(BUILDDIR)/$(TARGET)/ram_test.elf: $(OBJS_RAMTEST)
-	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+	$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@
-
+
-$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.S
+$(RAMTEST_BIN): $(BUILDDIR)/$(TARGET)/ram_test.elf
-	@mkdir -p "$(@D)"
+	@mkdir -p "$(@D)"
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(OBJCOPY) -S -O binary $< $@
-
+	@echo "RAM-Test payload: $(RAMTEST_BIN) ($$(wc -c < $@) bytes)"
-release: $(OUTPUTDIR)/$(OUTPUT_NAME)
+
-	@mkdir -p release/bootloader/payloads
+ram-test: $(RAMTEST_BIN)
-	@cp $(OUTPUTDIR)/$(OUTPUT_NAME) release/bootloader/payloads/$(OUTPUT_NAME)
+
-	@cd release && zip -r ../$(TARGET)-$(VERSION).zip bootloader
+$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.c
-	@echo "Release package created: $(TARGET)-$(VERSION).zip"
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/%.o: $(SOURCEDIR)/%.S
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.c
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) $(BDKINC) -I$(SOURCEDIR) -c $< -o $@
+
+$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.S
+	@mkdir -p "$(@D)"
+	$(CC) $(CFLAGS) -c $< -o $@
+
+release: $(OUTPUTDIR)/$(OUTPUT_NAME)
+	@mkdir -p release/bootloader/payloads
+	@cp $(OUTPUTDIR)/$(OUTPUT_NAME) release/bootloader/payloads/$(OUTPUT_NAME)
+	@cd release && zip -r ../$(TARGET)-$(VERSION).zip bootloader
+	@echo "Release package created: $(TARGET)-$(VERSION).zip"

source/deletion_lists_update.h

@@ -122,8 +122,9 @@ static const char* config_dirs_to_delete[] = {
 };
 
 // Switch directories to delete
-// NOTE: .overlays and .packages excluded - preserve UltraHand .offload hide state during updates
 static const char* switch_dirs_to_delete[] = {
+    "sd:/switch/.packages",
+    "sd:/switch/.overlays",
     "sd:/switch/90DNS_tester",
     "sd:/switch/aio-switch-updater",
     "sd:/switch/amsPLUS-downloader",
@@ -171,7 +172,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",
@@ -222,9 +222,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,6 +3,7 @@
  */
 
 #include "install.h"
+#include "dram_fuse.h"
 #include "fs.h"
 #include "version.h"
 #include "gfx.h"
@@ -113,6 +114,38 @@ void install_combine_path(char *result, size_t size, const char *base, const cha
     }
 }
 
+/* Copy every regular file at staging root to dst_root; subdirs and volume labels skipped. */
+int install_copy_staging_root_files(const char *staging, const char *dst_root) {
+    DIR dir;
+    FILINFO fno;
+    char src_full[256];
+    char dst_full[256];
+    int res = f_opendir(&dir, staging);
+    if (res != FR_OK)
+        return res;
+
+    while (1) {
+        res = f_readdir(&dir, &fno);
+        if (res != FR_OK || fno.fname[0] == 0)
+            break;
+        if (fno.fname[0] == '.' && (fno.fname[1] == '\0' || (fno.fname[1] == '.' && fno.fname[2] == '\0')))
+            continue;
+        if (fno.fattrib & (AM_DIR | AM_VOL))
+            continue;
+
+        install_combine_path(src_full, sizeof(src_full), staging, fno.fname);
+        install_combine_path(dst_full, sizeof(dst_full), dst_root, fno.fname);
+        res = file_copy(src_full, dst_full);
+        if (res != FR_OK) {
+            f_closedir(&dir);
+            return res;
+        }
+    }
+
+    f_closedir(&dir);
+    return FR_OK;
+}
+
 // Recursive folder copy with progress tracking
 static int folder_copy_progress_recursive(const char *src, const char *dst, int *copied, int total, u32 start_x, u32 start_y, const char *display_name, int *last_percent) {
     DIR dir;
@@ -275,167 +308,6 @@ int folder_copy_with_progress_v2(const char *src, const char *dst, const char *d
     return res;
 }
 
-// Copy one directory (e.g. .overlays or .packages) with .offload awareness: if the same
-// name exists in dst_offload, copy pack's version into dst_offload (update in place);
-// otherwise copy to dst_parent. Used only for update mode to preserve UltraHand hide state.
-static int copy_dir_offload_aware(const char *src_parent, const char *dst_parent, const char *dst_offload,
-    const char *display_name, int *copied, int total, u32 start_x, u32 start_y, int *last_percent)
-{
-    DIR dir;
-    FILINFO fno;
-    int res;
-    char src_full[256];
-    char dst_main[256];
-    char dst_off[256];
-
-    res = f_opendir(&dir, src_parent);
-    if (res != FR_OK)
-        return res;
-
-    while (1) {
-        res = f_readdir(&dir, &fno);
-        if (res != FR_OK || fno.fname[0] == 0) break;
-        if (fno.fname[0] == '.' && (fno.fname[1] == '\0' || (fno.fname[1] == '.' && fno.fname[2] == '\0')))
-            continue;
-        if (strcmp(fno.fname, ".offload") == 0)
-            continue;
-
-        install_combine_path(src_full, sizeof(src_full), src_parent, fno.fname);
-        install_combine_path(dst_off, sizeof(dst_off), dst_offload, fno.fname);
-
-        if (install_path_exists(dst_off)) {
-            res = (fno.fattrib & AM_DIR) ? folder_copy(src_full, dst_offload) : file_copy(src_full, dst_off);
-        } else {
-            install_combine_path(dst_main, sizeof(dst_main), dst_parent, fno.fname);
-            res = (fno.fattrib & AM_DIR) ? folder_copy(src_full, dst_parent) : file_copy(src_full, dst_main);
-        }
-        (*copied)++;
-        if (total > 0) {
-            int percent = (*copied * 100) / total;
-            if (percent != *last_percent || *copied % 20 == 0) {
-                gfx_con_setpos(start_x, start_y);
-                install_set_color(COLOR_CYAN);
-                gfx_printf("  Kopiere: %s [%3d%%] (%d/%d)", display_name, percent, *copied, total);
-                install_set_color(COLOR_WHITE);
-                *last_percent = percent;
-            }
-        }
-        if (res != FR_OK) {
-            f_closedir(&dir);
-            return res;
-        }
-    }
-    f_closedir(&dir);
-    return FR_OK;
-}
-
-// Copy switch/ folder for update mode only: preserve SD's .overlays/.offload and
-// .packages/.offload; for items that exist there, update in place instead of main area.
-int folder_copy_switch_update_offload_aware(const char *src_switch, const char *dst_base, const char *display_name) {
-    char dst_switch[256];
-    char src_overlays[256], src_packages[256];
-    char dst_overlays[256], dst_offload_ovl[256], dst_packages[256], dst_offload_pkg[256];
-    DIR dir;
-    FILINFO fno;
-    int res;
-    int copied = 0;
-    int total;
-    int last_percent = -1;
-    u32 start_x, start_y;
-
-    install_combine_path(dst_switch, sizeof(dst_switch), dst_base, "switch");
-
-    if (!install_path_exists(src_switch)) {
-        install_set_color(COLOR_ORANGE);
-        gfx_printf("  Ueberspringe: %s (nicht gefunden)\n", display_name);
-        install_set_color(COLOR_WHITE);
-        return FR_NO_FILE;
-    }
-
-    total = install_count_directory_items(src_switch);
-    if (total == 0) {
-        f_mkdir(dst_switch);
-        return FR_OK;
-    }
-
-    gfx_con_getpos(&start_x, &start_y);
-    install_set_color(COLOR_CYAN);
-    gfx_printf("  Kopiere: %s [  0%%] (0/%d)", display_name, total);
-    install_set_color(COLOR_WHITE);
-
-    res = f_mkdir(dst_switch);
-    if (res != FR_OK && res != FR_EXIST) return res;
-
-    res = f_opendir(&dir, src_switch);
-    if (res != FR_OK) return res;
-
-    while (1) {
-        res = f_readdir(&dir, &fno);
-        if (res != FR_OK || fno.fname[0] == 0) break;
-        if (fno.fname[0] == '.' && (fno.fname[1] == '\0' || (fno.fname[1] == '.' && fno.fname[2] == '\0')))
-            continue;
-
-        if (strcmp(fno.fname, ".overlays") == 0) {
-            install_combine_path(src_overlays, sizeof(src_overlays), src_switch, ".overlays");
-            install_combine_path(dst_overlays, sizeof(dst_overlays), dst_switch, ".overlays");
-            install_combine_path(dst_offload_ovl, sizeof(dst_offload_ovl), dst_overlays, ".offload");
-            if (!install_path_exists(src_overlays)) { f_closedir(&dir); continue; }
-            f_mkdir(dst_overlays);
-            f_mkdir(dst_offload_ovl);
-            res = copy_dir_offload_aware(src_overlays, dst_overlays, dst_offload_ovl, display_name,
-                &copied, total, start_x, start_y, &last_percent);
-        } else if (strcmp(fno.fname, ".packages") == 0) {
-            install_combine_path(src_packages, sizeof(src_packages), src_switch, ".packages");
-            install_combine_path(dst_packages, sizeof(dst_packages), dst_switch, ".packages");
-            install_combine_path(dst_offload_pkg, sizeof(dst_offload_pkg), dst_packages, ".offload");
-            if (!install_path_exists(src_packages)) { f_closedir(&dir); continue; }
-            f_mkdir(dst_packages);
-            f_mkdir(dst_offload_pkg);
-            {   /* package.ini into main area */
-                char src_ini[256], dst_ini[256];
-                s_printf(src_ini, "%s/package.ini", src_packages);
-                s_printf(dst_ini, "%s/package.ini", dst_packages);
-                if (install_path_exists(src_ini)) {
-                    res = file_copy(src_ini, dst_ini);
-                    if (res == FR_OK) copied++;
-                }
-            }
-            res = copy_dir_offload_aware(src_packages, dst_packages, dst_offload_pkg, display_name,
-                &copied, total, start_x, start_y, &last_percent);
-        } else {
-            char src_full[256], dst_full[256];
-            install_combine_path(src_full, sizeof(src_full), src_switch, fno.fname);
-            install_combine_path(dst_full, sizeof(dst_full), dst_switch, fno.fname);
-            if (fno.fattrib & AM_DIR)
-                res = folder_copy(src_full, dst_switch);
-            else
-                res = file_copy(src_full, dst_full);
-            copied++;
-        }
-        if (res != FR_OK) break;
-        if (total > 0 && (copied % 20 == 0 || copied == total)) {
-            int percent = (copied * 100) / total;
-            gfx_con_setpos(start_x, start_y);
-            install_set_color(COLOR_CYAN);
-            gfx_printf("  Kopiere: %s [%3d%%] (%d/%d)", display_name, percent, copied, total);
-            install_set_color(COLOR_WHITE);
-        }
-    }
-    f_closedir(&dir);
-
-    gfx_con_setpos(start_x, start_y);
-    if (res == FR_OK) {
-        install_set_color(COLOR_GREEN);
-        gfx_printf("  Kopiere: %s [100%%] (%d/%d) - Fertig!\n", display_name, copied, total);
-        install_set_color(COLOR_WHITE);
-    } else {
-        install_set_color(COLOR_RED);
-        gfx_printf("  Kopiere: %s - Fehlgeschlagen!\n", display_name);
-        install_set_color(COLOR_WHITE);
-    }
-    return res;
-}
-
 // Recursive folder delete with progress tracking (shared implementation)
 int folder_delete_progress_recursive(const char *path, int *deleted, int total, u32 start_x, u32 start_y, const char *display_name, int *last_percent) {
     DIR dir;
@@ -747,6 +619,50 @@ 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"
+
+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);
+}
+
+/* After pack copy: if >4 GiB fuse RAM, install 8GB Hekate to payload.bin + bootloader/update.bin; always remove hekate_8gb.bin when done or if not used. */
+static void install_hekate_8gb_post_copy(void)
+{
+    if (!install_path_exists(HEKATE_8GB_SRC))
+        return;
+
+    int mib = dram_capacity_mib_from_fuse();
+    if (mib > 4096) {
+        install_set_color(COLOR_CYAN);
+        gfx_printf("\nMehr als 4 GB RAM erkannt (Fuse). Die 8-GB-Hekate-Variante wird verwendet.\n");
+        gfx_printf("Kopiere nach payload.bin und bootloader/update.bin...\n");
+        install_set_color(COLOR_WHITE);
+
+        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) {
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  [OK] Hekate 8 GB installiert.\n");
+            install_set_color(COLOR_WHITE);
+            unlink_ignore_err(HEKATE_8GB_SRC);
+        } else {
+            install_set_color(COLOR_ORANGE);
+            gfx_printf("  [WARN] Kopie fehlgeschlagen (payload: %d, update: %d). hekate_8gb.bin bleibt.\n", r1, r2);
+            install_set_color(COLOR_WHITE);
+        }
+    } else {
+        unlink_ignore_err(HEKATE_8GB_SRC);
+    }
+}
+
 // Main installation function
 int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
     int res;
@@ -764,9 +680,11 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
         install_set_color(COLOR_YELLOW);
         gfx_printf("Schritt 2: Dateien kopieren...\n");
         install_set_color(COLOR_WHITE);
-        res = update_mode_install(pack_variant, true);
+        res = update_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);
@@ -805,7 +723,9 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
         install_set_color(COLOR_WHITE);
         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

@@ -18,8 +18,7 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode);
 
 // Update mode operations (install_update.c)
 int update_mode_cleanup(omninx_variant_t variant);
-/* offload_aware_switch: true = update (preserve .offload), false = clean (normal copy) */
+int update_mode_install(omninx_variant_t variant);
-int update_mode_install(omninx_variant_t variant, bool offload_aware_switch);
 int cleanup_staging_directory(omninx_variant_t pack_variant);
 // Remove other OmniNX staging directories (Standard/Light/OC) that exist, except the one just installed
 int cleanup_other_staging_directories(omninx_variant_t installed_variant);
@@ -36,10 +35,9 @@ void install_check_and_clear_screen_if_needed(void);
 bool install_path_exists(const char *path);
 int install_count_directory_items(const char *path);
 void install_combine_path(char *result, size_t size, const char *base, const char *add);
+int install_copy_staging_root_files(const char *staging, const char *dst_root);
 int delete_path_list(const char* paths[], const char* description);
 int delete_path_lists_grouped(const char *folder_display_name, ...);
 int folder_delete_single_with_progress(const char *path, const char *display_name);
 int folder_delete_progress_recursive(const char *path, int *deleted, int total, u32 start_x, u32 start_y, const char *display_name, int *last_percent);
 int folder_copy_with_progress_v2(const char *src, const char *dst, const char *display_name);
-// Update-only: copy switch/ preserving .overlays/.offload and .packages/.offload (UltraHand hide state)
-int folder_copy_switch_update_offload_aware(const char *src_switch, const char *dst_base, const char *display_name);

source/install_clean.c

@@ -107,9 +107,9 @@ int clean_mode_restore(void) {
     return res;
 }
 
-// Clean mode: Install files (reuse update copy logic, but normal switch copy – no .offload preservation)
+// Clean mode: Install files (reuse update mode install)
 int clean_mode_install(omninx_variant_t variant) {
-    return update_mode_install(variant, false);
+    return update_mode_install(variant);
 }
 
 // Remove other staging directories (OmniNX Standard/Light/OC) that exist on SD

source/install_update.c

@@ -73,13 +73,11 @@ int update_mode_cleanup(omninx_variant_t variant) {
     return FR_OK;
 }
 
-// Update/Clean mode: Copy files from staging.
+// Update mode: Copy files from staging
-// offload_aware_switch: true = update (preserve .overlays/.offload, .packages/.offload); false = clean (normal copy).
+int update_mode_install(omninx_variant_t variant) {
-int update_mode_install(omninx_variant_t variant, bool offload_aware_switch) {
     int res;
     const char* staging = get_staging_path(variant);
     char src_path[256];
-    char dst_path[256];
 
     if (!staging) {
         return FR_INVALID_PARAMETER;
@@ -104,10 +102,11 @@ int update_mode_install(omninx_variant_t variant, bool offload_aware_switch) {
     if (res != FR_OK && res != FR_NO_FILE) return res;
 
     s_printf(src_path, "%s/switch", staging);
-    if (offload_aware_switch)
+    res = folder_copy_with_progress_v2(src_path, "sd:/", "switch/");
-        res = folder_copy_switch_update_offload_aware(src_path, "sd:/", "switch/");
+    if (res != FR_OK && res != FR_NO_FILE) return res;
-    else
+
-        res = folder_copy_with_progress_v2(src_path, "sd:/", "switch/");
+    s_printf(src_path, "%s/themes", staging);
+    res = folder_copy_with_progress_v2(src_path, "sd:/", "themes/");
     if (res != FR_OK && res != FR_NO_FILE) return res;
 
     s_printf(src_path, "%s/warmboot_mariko", staging);
@@ -124,29 +123,9 @@ int update_mode_install(omninx_variant_t variant, bool offload_aware_switch) {
     gfx_printf("  Kopiere Root-Dateien...\n");
     set_color(COLOR_WHITE);
 
-    s_printf(src_path, "%s/boot.dat", staging);
+    res = install_copy_staging_root_files(staging, "sd:/");
-    s_printf(dst_path, "sd:/boot.dat");
+    if (res != FR_OK)
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
+        return res;
-
-    s_printf(src_path, "%s/boot.ini", staging);
-    s_printf(dst_path, "sd:/boot.ini");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/exosphere.ini", staging);
-    s_printf(dst_path, "sd:/exosphere.ini");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/hbmenu.nro", staging);
-    s_printf(dst_path, "sd:/hbmenu.nro");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/loader.bin", staging);
-    s_printf(dst_path, "sd:/loader.bin");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
-
-    s_printf(src_path, "%s/payload.bin", staging);
-    s_printf(dst_path, "sd:/payload.bin");
-    if (path_exists(src_path)) file_copy(src_path, dst_path);
 
     set_color(COLOR_GREEN);
     gfx_printf("  Kopie abgeschlossen!\n");

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);
@@ -244,11 +250,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,7 +283,11 @@ 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 +341,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);
@@ -352,6 +366,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;
@@ -377,6 +396,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);
@@ -403,20 +436,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 +507,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 +522,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 +577,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 +606,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);
+}