From ff2b7a10c7a8571caca3919358d8c49dea701797 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sat, 21 Jan 2017 21:46:54 +0000
Subject: [PATCH] - conditional inclusion of debugger - improved linker script

git-svn-id: http://moon:8086/svn/mips@116 a8ebac50-d88d-4704-bea3-6648445a41b3
---
 src/bootloader/Makefile              | 2 +-
 src/bootloader/boards/denano/board.c | 3 ++-
 src/bootloader/bootloader.ld         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bootloader/Makefile b/src/bootloader/Makefile
index 12a0a68..5a15b4b 100644
--- a/src/bootloader/Makefile
+++ b/src/bootloader/Makefile
@@ -12,7 +12,7 @@ else
   ENDIAN_FLAGS=-EB
 endif
 
-CFLAGS=$(ENDIAN_FLAGS) -Os -flto -Wl,-M -I. -I../libsys -msoft-float -march=r3000 -G0 -I../libsys/boards/$(BOARD) -D$(BOARD) -DWITH_GDB_STUB
+CFLAGS=$(ENDIAN_FLAGS) -Os -flto -Wl,-M -I. -I../libsys -msoft-float -march=r3000 -G0 -I../libsys/boards/$(BOARD) -D$(BOARD) -DWITH_DEBUGGER -DWITH_GDB_STUB
 LFLAGS=$(ENDIAN_FLAGS) -Os -flto
 
 ifeq ($(TLB),yes)
diff --git a/src/bootloader/boards/denano/board.c b/src/bootloader/boards/denano/board.c
index 5dc45d8..40013e5 100644
--- a/src/bootloader/boards/denano/board.c
+++ b/src/bootloader/boards/denano/board.c
@@ -10,9 +10,9 @@
 #include "../../../libsys/irq.h"
 #include "../../../libsys/uart.h"
 
+#ifdef WITH_DEBUGGER
 extern uart_if_t uart_if[];
 extern void handle_exception (unsigned long *registers);
-
 extern int dbg_stub(struct xcptcontext * xcp) __attribute__ ((section (".dbg_stub"))) __attribute__ ((used));
 
 int dbg_stub(struct xcptcontext * xcp)
@@ -48,6 +48,7 @@ char dbg_getchar()
 	
 	return (char)c;
 }
+#endif
 
 void board_init(void)
 {
diff --git a/src/bootloader/bootloader.ld b/src/bootloader/bootloader.ld
index 92faeed..3330a9c 100644
--- a/src/bootloader/bootloader.ld
+++ b/src/bootloader/bootloader.ld
@@ -21,7 +21,7 @@ SECTIONS
      *(.ktext)
      *(.text*)
      *(.rodata*)
-     . = ORIGIN(rom) + 0x1F00;
+     . = ORIGIN(rom) + LENGTH(rom) - 0x100;
      *(.dbg_stub*)
    }  > rom