Further improvements/fixes to setup-env.sh + friends

Author: xfxf

.gitignore

@@ -11,4 +11,4 @@ makestuff
 migen
 misoc
 *.pyc
-
+*.pnm

Makefile

@@ -17,8 +17,8 @@ endif
 help:
 	@echo "Targets avaliable:"
 	@echo " make gateware"
-	@echo " make load_gateware"
-	@echo " make load_firmware (OR) make load_firmware_alt"
+	@echo " make load-gateware"
+	@echo " make load-lm32-firmware"
 	@echo " make clean"
 	@echo ""
 	@echo "Environment:"

firmware/lm32/Makefile

@@ -1,5 +1,5 @@
 # XXX remove this
-MSCDIR=../../misoc
+MSCDIR=../../build/misoc
 include $(MSCDIR)/software/common.mak
 
 OBJECTS=isr.o processor.o dvisampler.o edid.o pll.o ci.o config.o encoder.o main.o

scripts/setup-env.sh

@@ -20,8 +20,8 @@ if [ ! -z $MISOC_ENV ]; then
   exit 1
 fi
 
-export LD_LIBRARY_PATH=$TOP_DIR/../makestuff/libs/libfpgalink/lin.x64/rel:$LD_LIBRARY_PATH
-export PYTHONPATH=$TOP_DIR/migen:$TOP_DIR/misoc:$TOP_DIR/../makestuff/libs/libfpgalink/examples/python/:$PYTHONPATH
+export LD_LIBRARY_PATH=$TOP_DIR/makestuff/libs/libfpgalink/lin.x64/rel:$LD_LIBRARY_PATH
+export PYTHONPATH=$TOP_DIR/migen:$TOP_DIR/misoc:$TOP_DIR/makestuff/libs/libfpgalink/examples/python/:$PYTHONPATH
 export PATH=$TOP_DIR/gnu/output/bin:/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/:$PATH
 
 alias python=python3