Merge in d0k3#883 and fix merge conflicts

ihaveamac · Dec 2, 2024 · 849a2a4 · 849a2a4
2 parents 47717ac + 76c322a
commit 849a2a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/arm9/Makefile b/arm9/Makefile
@@ -18,7 +18,7 @@ include ../Makefile.common
 include ../Makefile.build
 
 arm9_data.elf: arm9.elf
-	arm-none-eabi-objcopy -O elf32-littlearm -j .rodata* -j .data* -j .bss* $< $@
+	$(OBJCOPY) -O elf32-littlearm -j .rodata* -j .data* -j .bss* $< $@
 
 arm9_code.elf: arm9.elf
-	arm-none-eabi-objcopy -O elf32-littlearm -j .text* -j .vectors* $< $@
+	$(OBJCOPY) -O elf32-littlearm -j .text* -j .vectors* $< $@
diff --git a/arm9/link.ld b/arm9/link.ld
@@ -6,7 +6,7 @@ MEMORY
 {
     VECTORS (RX) : ORIGIN = 0x08000000, LENGTH = 64
     CODEMEM (RX) : ORIGIN = 0x08000040, LENGTH = 512K - 64
-    BOOTMIR (R)  : ORIGIN = 0x08080000, LENGTH = 128K /* BootROM mirrors, don't touch! */
+    BOOTROM (R)  : ORIGIN = 0x08080000, LENGTH = 128K /* BootROM mirrors, don't touch! */
     DATAMEM (RW) : ORIGIN = 0x080A0000, LENGTH = 384K
 }