From 1c1eae6e8ec294ccaf205ee65ae013d4932175a6 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sat, 14 Feb 2009 15:36:13 +0000 Subject: [PATCH] - using env. vars for tool dirs 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@348 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/CPUs/MIPS/bsp/examples/Makefile | 6 ++---- lib/CPUs/MIPS/bsp/examples/bootloader/Makefile | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/CPUs/MIPS/bsp/examples/Makefile b/lib/CPUs/MIPS/bsp/examples/Makefile index c2fe58e..15bfe3a 100644 --- a/lib/CPUs/MIPS/bsp/examples/Makefile +++ b/lib/CPUs/MIPS/bsp/examples/Makefile @@ -1,8 +1,6 @@ -TOOLS_DIR=../../tools - CFLAGS=-msoft-float -O2 -march=r3000 -I. LFLAGS=-M -T link.ld -LIB_DIRS=-L . -L /usr/local/mipsel-elf/lib -L /usr/local/lib/gcc/mipsel-elf/4.3.2 +LIB_DIRS=-L . -L $(MIPS_TOOLS_PREFIX)/mipsel-elf/lib -L $(MIPS_TOOLS_PREFIX)/lib/gcc/mipsel-elf/$(MIPS_GCC_VER) LIBS=-lc -lm -lgcc AS=mipsel-elf-as @@ -11,7 +9,7 @@ CC=mipsel-elf-gcc LD=mipsel-elf-ld OBJDUMP=mipsel-elf-objdump OBJCOPY=mipsel-elf-objcopy -FLASHGEN=$(TOOLS_DIR)/flashgen_little +FLASHGEN=flashgen_el PROG = hello testbench test_irq dhry queens stanford paranoia rmd160_test Bessel whet phrasen dttl richards_benchmark diff --git a/lib/CPUs/MIPS/bsp/examples/bootloader/Makefile b/lib/CPUs/MIPS/bsp/examples/bootloader/Makefile index 68f8171..7737cd0 100644 --- a/lib/CPUs/MIPS/bsp/examples/bootloader/Makefile +++ b/lib/CPUs/MIPS/bsp/examples/bootloader/Makefile @@ -1,9 +1,8 @@ ROM_WORDADDR_WIDTH=11 -TOOLS_DIR=../../../tools CFLAGS=-Os -I. -I../ -msoft-float -march=r3000 LFLAGS=-M -T bootloader.ld -LIB_DIRS=-L /usr/local/mipsel-elf/lib -L /usr/local/lib/gcc/mipsel-elf/4.3.2 +LIB_DIRS=-L $(MIPS_TOOLS_PREFIX)/mipsel-elf/lib -L $(MIPS_TOOLS_PREFIX)/lib/gcc/mipsel-elf/$(MIPS_GCC_VER) LIBS=-lc -lgcc CC=mipsel-elf-gcc