From e8ea50f528568f5328d73fecbb9eda126e364d97 Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Fri, 1 Nov 2024 21:39:26 -0600 Subject: [PATCH] Fix build error --- booter/arm9/source/main.cpp | 2 +- booter/bootloader/Makefile | 2 +- booter/bootloader/load.ld | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/booter/arm9/source/main.cpp b/booter/arm9/source/main.cpp index 62b6f18ab5..22cbc8da05 100644 --- a/booter/arm9/source/main.cpp +++ b/booter/arm9/source/main.cpp @@ -320,7 +320,7 @@ int main(int argc, char **argv) { vector argarray; argarray.push_back((char*)srldrPath); - int err = runNdsFile(argarray[0], argarray.size(), (const char**)&argarray[0], true, false, false, true, true, false, -1); + int err = runNdsFile(argarray[0], argarray.size(), (const char**)&argarray[0], true, true, false, false, true, true, false, -1); bool twlmFound = (access("sd:/_nds/TWiLightMenu", F_OK) == 0); waitBeforeFade = false; diff --git a/booter/bootloader/Makefile b/booter/bootloader/Makefile index 3e35045bcd..e56261814c 100644 --- a/booter/bootloader/Makefile +++ b/booter/bootloader/Makefile @@ -31,7 +31,7 @@ CFLAGS := -g -Wall -O2 \ CFLAGS += $(INCLUDE) $(EXTRA_CFLAGS) -DARM7 -DNO_DLDI -ASFLAGS := -g $(ARCH) -flto $(EXTRA_CFLAGS) $(INCLUDE) +ASFLAGS := -g $(ARCH) -flto $(EXTRA_CFLAGS) $(INCLUDE) -DNO_DLDI LDFLAGS = -nostartfiles -T $(TOPDIR)/load.ld -g $(ARCH) -Wl,-Map,$(TARGET).map LIBS := diff --git a/booter/bootloader/load.ld b/booter/bootloader/load.ld index 53f37287ea..566c3e6dd9 100644 --- a/booter/bootloader/load.ld +++ b/booter/bootloader/load.ld @@ -4,7 +4,7 @@ ENTRY(_start) MEMORY { - vram : ORIGIN = 0x06000000, LENGTH = 128K + vram : ORIGIN = 0x06008000, LENGTH = 128K - 32K } __vram_start = ORIGIN(vram);