From bc8ff41a38269a910e4d41276e2005dd16ae2988 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <libretroadmin@users.noreply.github.com>
Date: Thu, 29 Oct 2026 18:26:04 +0100
Subject: [PATCH] Wii: app_booter moves to os/gekko/rvl

The loader stub the libogc builds embed to hand the console to the next
program lives under os/gekko/rvl with the rest of the Wii's own code;
its binary object's symbols are named after the new path.
---
 .gitignore                                 | 3 +--
 Makefile.griffin                           | 2 +-
 Makefile.wii                               | 2 +-
 Makefile.wii.salamander                    | 2 +-
 frontend/drivers/platform_wii_libogc.c     | 8 ++++----
 {wii => os/gekko/rvl}/app_booter/Makefile  | 2 +-
 {wii => os/gekko/rvl}/app_booter/crt0.s    | 0
 {wii => os/gekko/rvl}/app_booter/elf_abi.h | 0
 {wii => os/gekko/rvl}/app_booter/link.ld   | 0
 {wii => os/gekko/rvl}/app_booter/main.c    | 0
 10 files changed, 9 insertions(+), 10 deletions(-)
 rename {wii => os/gekko/rvl}/app_booter/Makefile (96%)
 rename {wii => os/gekko/rvl}/app_booter/crt0.s (100%)
 rename {wii => os/gekko/rvl}/app_booter/elf_abi.h (100%)
 rename {wii => os/gekko/rvl}/app_booter/link.ld (100%)
 rename {wii => os/gekko/rvl}/app_booter/main.c (100%)

diff --git a/.gitignore b/.gitignore
index bae14214c6..bff3c66cde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,7 @@ Debug
 Release
 ipch
 *.user
-/bootstrap/gx/wii/app_booter/app_booter.bin
-/wii/app_booter/app_booter.bin
+/os/gekko/rvl/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/
diff --git a/Makefile.griffin b/Makefile.griffin
index f09e818bda..6430e14ef5 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -216,7 +216,7 @@ else ifeq ($(libogc_platform), 1)
       HAVE_RARCH_EXEC          := 1
       HAVE_RSOUND              := 1
 
-      APP_BOOTER_DIR = wii/app_booter
+      APP_BOOTER_DIR = os/gekko/rvl/app_booter
       PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
 
       ifeq ($(USBGECKO), 1)
diff --git a/Makefile.wii b/Makefile.wii
index d5d339ad5d..189be8ecac 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -183,7 +183,7 @@ HAVE_CHEEVOS             := 1
 
 CFLAGS      += -DHAVE_SOCKET_LEGACY -DHAVE_CHEEVOS
 
-APP_BOOTER_DIR = wii/app_booter
+APP_BOOTER_DIR = os/gekko/rvl/app_booter
 PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
 else
 HAVE_WIIUSB_HID          := 0
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 8515f18c76..67c9507025 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -52,7 +52,7 @@ MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 
-APP_BOOTER_DIR = wii/app_booter
+APP_BOOTER_DIR = os/gekko/rvl/app_booter
 
 ifeq ($(HAVE_LIBOGC), 0)
 LDFLAGS += -T os/gekko/boot/rvl.ld
diff --git a/frontend/drivers/platform_wii_libogc.c b/frontend/drivers/platform_wii_libogc.c
index 35c5713b14..0972baa956 100644
--- a/frontend/drivers/platform_wii_libogc.c
+++ b/frontend/drivers/platform_wii_libogc.c
@@ -51,10 +51,10 @@
 #define BOOTER_ADDR  ((uint8_t *) 0x93000000)
 #define ARGS_ADDR    ((uint8_t *) 0x93200000)
 
-extern uint8_t _binary_wii_app_booter_app_booter_bin_start[];
-extern uint8_t _binary_wii_app_booter_app_booter_bin_end[];
-#define booter_start _binary_wii_app_booter_app_booter_bin_start
-#define booter_end _binary_wii_app_booter_app_booter_bin_end
+extern uint8_t _binary_os_gekko_rvl_app_booter_app_booter_bin_start[];
+extern uint8_t _binary_os_gekko_rvl_app_booter_app_booter_bin_end[];
+#define booter_start _binary_os_gekko_rvl_app_booter_app_booter_bin_start
+#define booter_end _binary_os_gekko_rvl_app_booter_app_booter_bin_end
 
 #ifdef IS_SALAMANDER
 char gx_rom_path[PATH_MAX_LENGTH];
diff --git a/wii/app_booter/Makefile b/os/gekko/rvl/app_booter/Makefile
similarity index 96%
rename from wii/app_booter/Makefile
rename to os/gekko/rvl/app_booter/Makefile
index 0c38ac0fa3..381f6a4a11 100644
--- a/wii/app_booter/Makefile
+++ b/os/gekko/rvl/app_booter/Makefile
@@ -21,7 +21,7 @@ OBJCOPY = $(DEVKITPPC)/bin/powerpc-eabi-objcopy$(EXE_EXT)
 BIN_TARGET := app_booter.bin
 ELF_TARGET := app_booter.elf
 
-LIBRETRO_COMM_DIR := ../../libretro-common
+LIBRETRO_COMM_DIR := ../../../../libretro-common
 
 LIBDIRS :=
 INCLUDE := -I.  -I$(LIBRETRO_COMM_DIR)/crt/include
diff --git a/wii/app_booter/crt0.s b/os/gekko/rvl/app_booter/crt0.s
similarity index 100%
rename from wii/app_booter/crt0.s
rename to os/gekko/rvl/app_booter/crt0.s
diff --git a/wii/app_booter/elf_abi.h b/os/gekko/rvl/app_booter/elf_abi.h
similarity index 100%
rename from wii/app_booter/elf_abi.h
rename to os/gekko/rvl/app_booter/elf_abi.h
diff --git a/wii/app_booter/link.ld b/os/gekko/rvl/app_booter/link.ld
similarity index 100%
rename from wii/app_booter/link.ld
rename to os/gekko/rvl/app_booter/link.ld
diff --git a/wii/app_booter/main.c b/os/gekko/rvl/app_booter/main.c
similarity index 100%
rename from wii/app_booter/main.c
rename to os/gekko/rvl/app_booter/main.c