X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Makefile;h=df07f9cd8e660075677579150264fa852e8b2851;hb=74dd99e461e1c4065a3e53b8e41797caedfa4e87;hp=8af926224607b929853a50a686e5bbbb6735b82b;hpb=750d9b37905b7a1cf9e8708c4688f3342c8be133;p=fx2fw-sdcc

diff --git a/Makefile b/Makefile
index 8af9262..df07f9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,174 +1,92 @@
 #-----------------------------------------------------------------------------
-
 # Makefile for usb_jtag FX2 firmware
-
 #-----------------------------------------------------------------------------
-
 # Copyright 2007 Kolja Waschk, ixo.de
-
 #-----------------------------------------------------------------------------
-
 # This code is part of usbjtag. usbjtag is free software; you can redistribute
-
 # it and/or modify it under the terms of the GNU General Public License as
-
 # published by the Free Software Foundation; either version 2 of the License,
-
 # or (at your option) any later version. usbjtag is distributed in the hope
-
 # that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
 # GNU General Public License for more details.  You should have received a
-
 # copy of the GNU General Public License along with this program in the file
-
 # COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin
-
 # St, Fifth Floor, Boston, MA  02110-1301  USA
-
 #-----------------------------------------------------------------------------
 
-
-
 LIBDIR=fx2
-
 LIB=libfx2.lib
 
-
-
 ifeq (${HARDWARE},)
-
   HARDWARE=hw_basic
-
+  #HARDWARE=hw_saxo_l
   #HARDWARE=hw_xpcu_i
-
   #HARDWARE=hw_xpcu_x
-
 endif
 
-
-
 CC=sdcc
-
 CFLAGS+=-mmcs51 --no-xinit-opt -I${LIBDIR} -D${HARDWARE}
 
 CFLAGS+=--opt-code-size
 
-
-
-AS=asx8051
-
+AS=sdas8051
 ASFLAGS+=-plosgff
 
-
-
 LDFLAGS=--code-loc 0x0000 --code-size 0x1800
-
 LDFLAGS+=--xram-loc 0x1800 --xram-size 0x0800
-
 LDFLAGS+=-Wl '-b USBDESCSEG = 0xE100'
-
 LDFLAGS+=-L ${LIBDIR}
 
-
-
 %.rel : %.a51
-
 	$(AS) $(ASFLAGS) $<
 
-
-
 %.rel : %.c
-
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
+default: usbjtag.hex
 
-
-%.iic : %.hex
-
-	./hex2bix -ir -f 0xC2 -m 0xF000 -c 0x1 -o $@ $<
-
-
-
-default: usbjtag.iic
-
-
+#%.iic : %.hex
+#	./hex2bix -ir -f 0xC2 -m 0xF000 -c 0x1 -o $@ $<
+%.bix: %.hex
+	objcopy -I ihex -O binary $< $@
 
 usbjtag.hex: vectors.rel usbjtag.rel dscr.rel eeprom.rel ${HARDWARE}.rel startup.rel ${LIBDIR}/${LIB}
-
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
-
 	packihx $@ > .tmp.hex
-
 	rm $@
-
 	mv .tmp.hex $@
-
-
+	ls -al $@
 
 ${LIBDIR}/${LIB}:
-
 	make -C ${LIBDIR}
 
-
-
 .PHONY: boot
-
 boot: usbjtag.hex
-
 	-test -e /dev/usb_jtag    && /sbin/fxload -D /dev/usb_jtag    -I usbjtag.hex -t fx2
-
 	-test -e /dev/tracii_xl2  && /sbin/fxload -D /dev/tracii_xl2  -I usbjtag.hex -t fx2
-
 	-test -e /dev/xilinx_xpcu && /sbin/fxload -D /dev/xilinx_xpcu -I usbjtag.hex -t fx2
 
-
-
 REF=/home/kawk/work/xilinx/xtern/xusbdfwu/xusbdfwu-1025.hex
 
-
-
 .PHONY: ref
-
 ref: 
-
 	-test -e /dev/usb_jtag    && /sbin/fxload -D /dev/usb_jtag    -I ${REF} -t fx2
-
 	-test -e /dev/tracii_xl2  && /sbin/fxload -D /dev/tracii_xl2  -I ${REF} -t fx2
-
 	-test -e /dev/xilinx_xpcu && /sbin/fxload -D /dev/xilinx_xpcu -I ${REF} -t fx2
 
-
-
 dscr.rel: dscr.a51
-
 eeprom.rel: eeprom.c eeprom.h
-
 usbjtag.rel: usbjtag.c hardware.h eeprom.h
-
 ${HARDWARE}.rel: ${HARDWARE}.c hardware.h
 
-
-
 .PHONY: clean distclean
 
-
-
 clean:
-
 	make -C ${LIBDIR} clean
-
 	rm -f *.lst *.asm *.lib *.sym *.rel *.mem *.map *.rst *.lnk *.hex *.ihx *.iic
 
-
-
 distclean: clean
 
 
 
-
-
-
-