lx9_dave: makefile fixes

Change-Id: I280b33ad597b59b0cbb55a85d919aba67136f339

target/common/Makefile_loader.inc

@@ -3,13 +3,14 @@ XILINX      ?= /opt/Xilinx/14.7
 PATH       := $(PATH):${XILINX}/ISE_DS/ISE/bin/lin64:${PAPILIO}/linux64
 SHELL      := env PATH=$(PATH) /bin/bash
 
-build: working/$(TARGET).bit
+build: $(TARGET).bit
 
-working/$(TARGET).bit:
+$(TARGET).bit:
 	# create a working directory if necessary
 	mkdir -p working
 	# use the xilinx tools to synthesise the project and generate a bitstream file
 	xtclsh $(COMMON)/ise_build.tcl $(TARGET).xise
+	cp working/$(TARGET).bit $(TARGET).bit
 
 clean:
 	rm -rf working/ iceconfig/

target/lx9_dave/gen_mcs.sh

@@ -17,8 +17,8 @@ NAME=${DIR}/IceMulti_$(date +"%Y%m%d_%H%M")_$USER
 mkdir -p ${DIR}
 
 promgen                                          \
- -u      0 loader/working/MultiBootLoader.bit    \
- -u  54000 unknown/working/UnknownAdapter.bit    \
+ -u      0 loader/MultiBootLoader.bit            \
+ -u  54000 unknown/UnknownAdapter.bit            \
  -u  A8000 ice6502/ice6502.bit                   \
  -u  FC000 icez80/icez80.bit                     \
  -u 150000 ice65c02/ice65c02.bit                 \