From c2c77faa8c80cfa3380bd856158e42a431dfaea9 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sun, 31 Jan 2010 15:17:31 +0000
Subject: [PATCH] Minor changes Committed on the Free edition of March Hare
 Software CVSNT Server. Upgrade to CVS Suite for more features and support:
 http://march-hare.com/cvsnt/

git-svn-id: http://moon:8086/svn/vhdl/trunk@707 cc03376c-175c-47c8-b038-4cd826a8556b
---
 lib/CPUs/MIPS/bsp/examples/Makefile | 21 +++++----------------
 lib/CPUs/MIPS/bsp/examples/link.ld  |  1 +
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/lib/CPUs/MIPS/bsp/examples/Makefile b/lib/CPUs/MIPS/bsp/examples/Makefile
index db65f4b..c8e4cf0 100644
--- a/lib/CPUs/MIPS/bsp/examples/Makefile
+++ b/lib/CPUs/MIPS/bsp/examples/Makefile
@@ -1,7 +1,6 @@
 ENDIAN_FLAGS=-EB
-CFLAGS=$(ENDIAN_FLAGS) -msoft-float -O2 -march=r3000 -I. -Wl,-M
-LIBS=-lc -lm
-
+CFLAGS=$(ENDIAN_FLAGS) -Llibsys -Ilibsys -msoft-float -O2 -march=r3000 -I. -Wl,-M
+LIBS=-lsys
 
 AS=mipsel-elf-as
 AR=mipsel-elf-ar
@@ -15,19 +14,9 @@ PROG = hello.elf testbench.elf test_irq.elf dhry.elf queens.elf stanford.elf par
 
 all: $(PROG)
 
-libsys.a: startup.S kernel.S libsys.c libsys.h xcpt.c syscalls.c irq.c dbg.c mipsdis.c mips_gfx.c mips_gfx.h mips_ps2.c mips_ps2.h
-	$(CC) $(CFLAGS) -G 0 -c startup.S -o startup.o
-	$(CC) $(CFLAGS) -G 0 -c kernel.S -o kernel.o
-	$(CC) $(CFLAGS) -G 0 -c libsys.c -o libsys.o
-	$(CC) $(CFLAGS) -G 0 -c xcpt.c -o xcpt.o
-	$(CC) $(CFLAGS) -G 0 -c syscalls.c -o syscalls.o
-	$(CC) $(CFLAGS) -G 0 -c irq.c -o irq.o
-	$(CC) $(CFLAGS) -G 0 -c dbg.c -o dbg.o
-	$(CC) $(CFLAGS) -G 0 -c mipsdis.c -o mipsdis.o
-	$(CC) $(CFLAGS) -G 0 -c mips_gfx.c -o mips_gfx.o
-	$(CC) $(CFLAGS) -G 0 -c mips_ps2.c -o mips_ps2.o
-	$(AR) -r libsys.a libsys.o xcpt.o syscalls.o irq.o dbg.o mipsdis.o mips_gfx.o mips_ps2.o
-	
+libsys.a:
+	$(MAKE) -C libsys
+
 hello.elf: hello.c libsys.a
 	$(CC) $(CFLAGS) -o $@ -Os hello.c $(LIBS) >$@.map
 	$(OBJDUMP) -d $@ > $@.dis
diff --git a/lib/CPUs/MIPS/bsp/examples/link.ld b/lib/CPUs/MIPS/bsp/examples/link.ld
index 44b93b3..3110464 100644
--- a/lib/CPUs/MIPS/bsp/examples/link.ld
+++ b/lib/CPUs/MIPS/bsp/examples/link.ld
@@ -17,6 +17,7 @@ sys_timer_usec = 0xA000008;
 sys_timer_sec = 0xA000000C;
 
 STARTUP(startup.o)
+INPUT(kernel.o)
 
 SECTIONS
 {