From da27d6d6bbd9f7ce8f6d39b6333ad2e31ab55c31 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 5 Apr 2021 19:41:56 +0000
Subject: [PATCH] - refactored - fixed paths

git-svn-id: http://moon:8086/svn/mips@146 a8ebac50-d88d-4704-bea3-6648445a41b3
---
 src/bootloader/Makefile | 46 +----------------------------------------
 src/libsys/Makefile     |  2 +-
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/src/bootloader/Makefile b/src/bootloader/Makefile
index d068393..baecd92 100644
--- a/src/bootloader/Makefile
+++ b/src/bootloader/Makefile
@@ -1,48 +1,4 @@
-# environment vaiables read:
-# BOARD = {ml402, denano, sim}
-# TLB = {no, yes}
-# ENDIANESS = {eb, el}
-BOARD ?= ml402
-TLB ?= no
-ENDIANESS ?= eb
-DEBUGGER ?= gdb
-		
-ifeq ($(ENDIANESS),el)
-  ENDIAN_FLAGS=-EL
-else
-  ENDIAN_FLAGS=-EB
-endif
-
-ifeq ($(DEBUGGER),gdb)
-	DBG_FLAGS := -DWITH_DEBUGGER -DWITH_GDB_STUB
-	DBG_OBJ := gdb_stub.o
-endif
-ifeq ($(DEBUGGER),mips)
-	DBG_FLAGS := -DWITH_DEBUGGER
-	DBG_OBJ := mips_dbg.o mips_dis.o
-endif
-			  
-CFLAGS=$(ENDIAN_FLAGS) -Os -ffunction-sections -fdata-sections -I. -I../libsys -msoft-float -march=r3000 -G0 -I../libsys/boards/$(BOARD) -D$(BOARD) $(DBG_FLAGS)
-LFLAGS=$(ENDIAN_FLAGS) -Os -nostartfiles -nodefaultlibs -nostdlib -Wl,--gc-sections -Wl,-M 
-
-ifeq ($(TLB),yes)
-  CFLAGS+=-DSYS_IO_BASE=0xAC000000 -DSDRAM_BASE=0x80000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x88000000
-  LFLAGS+=-T bootloader_tlb.ld
-else
-  CFLAGS+=-DSYS_IO_BASE=0xA0000000 -DSDRAM_BASE=0x40000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x00000000
-  LFLAGS+=-T bootloader.ld
-endif
-
-BUILD_DIR=./build/$(BOARD)/$(ENDIANESS)
-		  
-LIBS=-lc -lgcc
-CFLAGS += -DXCP_SIZE=4096
-		  
-CC=mips-elf-gcc
-LD=mips-elf-gcc
-OBJDUMP=mips-elf-objdump
-OBJCOPY=mips-elf-objcopy
-ROMGEN=$(MIPS_HOME)/tools/romgen
+include ../../make/mips_boot.mk
 
 .PHONY: libsys
 
diff --git a/src/libsys/Makefile b/src/libsys/Makefile
index 60730a3..416f306 100644
--- a/src/libsys/Makefile
+++ b/src/libsys/Makefile
@@ -9,7 +9,7 @@ TLB ?= no
 ENDIANESS ?= eb
 DEBUGGER ?= mips
 
-include ../make/mips_lib.mk
+include ../../make/mips_lib.mk
 
 OBJS-ml402=$(addprefix $(BUILD_DIR)/, libsys.o xcpt.o syscalls.o cop0.o irq.o $(DBG_OBJ) console.o uart.o board.o gpio.o mips_ps2.o mips_gfx.o screen.o)
 OBJS-denano=$(addprefix $(BUILD_DIR)/, libsys.o xcpt.o syscalls.o cop0.o irq.o $(DBG_OBJ) console.o uart.o board.o gpio.o)