From 29ba0c6c7f2817dd5dd8c3d136e7afbcd4066cce Mon Sep 17 00:00:00 2001
From: Mateusz Faderewski <sc@mateuszfaderewski.pl>
Date: Fri, 8 Dec 2023 22:01:25 +0100
Subject: [PATCH] fixed bootloader issues

---
 sw/bootloader/N64.ld | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/sw/bootloader/N64.ld b/sw/bootloader/N64.ld
index f96acc1..72aa773 100644
--- a/sw/bootloader/N64.ld
+++ b/sw/bootloader/N64.ld
@@ -1,7 +1,5 @@
 MEMORY {
-    exception (rx)      : org = 0x80000000, len = 0x400
-    ram (rwx)           : org = 0x80000400, len = 1M
-    framebuffer (rw)    : org = 0x8016A000, len = 600k
+    ram (rwx) : org = 0x80000000, len = 2M
 }
 
 ENTRY(entry_handler)
@@ -10,11 +8,8 @@ __exception_stack_size = 8k;
 __stack_size = 16k;
 
 SECTIONS {
-    .exception : {
-        KEEP(*(.text.exception_vector));
-    } > exception
-
     .text : SUBALIGN(8) {
+        KEEP(*(.text.exception_vector));
         *(.text.entry_handler)
         *(.text .text.* .gnu.linkonce.t.*)
         *(.assets .assets.*)
@@ -32,6 +27,8 @@ SECTIONS {
         *(.scommon .scommon.*)
         *(.bss .bss.* .gnu.linkonce.b.*)
         *(COMMON)
+        . = ALIGN(64);
+        *(.framebuffer)
         . = ALIGN(8);
     } > ram
 
@@ -45,10 +42,6 @@ SECTIONS {
     . += __stack_size;
     _sp = .;
 
-    .framebuffer (NOLOAD) : SUBALIGN(64) {
-        *(.framebuffer .framebuffer.*)
-    } > framebuffer
-
     /DISCARD/ : {
         *(.MIPS.*)
     }