Merge m4a files into one, get rid of one asm

2019-02-01 10:37:13 +01:00
parent 7750a8126d
commit b4055e4fc0
8 changed files with 1784 additions and 1790 deletions
@@ -27,7 +27,7 @@ SECTIONS {
        INCLUDE "sym_bss.ld"

        /* .bss.code starts at 0x3001AA8 */
-        src/m4a_2.o(.bss.code);
+        src/m4a.o(.bss.code);

        /* COMMON starts at 0x30022A8 */
        INCLUDE "sym_common.ld"
@@ -319,9 +319,7 @@ SECTIONS {
    {
        asm/libgcnmultiboot.o(.text);
        asm/m4a_1.o(.text);
-        src/m4a_2.o(.text);
-        src/m4a_3.o(.text);
-        src/m4a_4.o(.text);
+        src/m4a.o(.text);
        src/agb_flash.o(.text);
        src/agb_flash_1m.o(.text);
        src/agb_flash_mx.o(.text);