--- a/Makefile.avr	Wed Mar 11 16:58:26 2009 +1030
+++ b/Makefile.avr	Wed Mar 11 17:10:13 2009 +1030
@@ -17,7 +17,7 @@
 # Tell as to generate listings
 CPPFLAGS+=-Wa,-adhlmsn=${<:T:S/.c/.lst/}
 
-MCU?=at90s8515
+MCU?=notset
 CFLAGS+=-mmcu=${MCU}
 
 LDFLAGS+=-Wl,-Map=${PROG}.map,--cref
@@ -26,7 +26,22 @@
 RM=rm -f
 
 PROGRAMMER=avrdude
-PROGOPTS?=-p ${PART} -c alf -E vcc,noreset -q
+PROGTYPE?=alf
+# Need the -B 1 or it is very slow. For slow clocks (eg factory fused) -B 10 works
+PROGEXTRA?=-B 1
+
+.if ${PROGTYPE} != "dragon_isp" && ${PROGTYPE} != "dragon_jtag"
+PROGEXITS?=vcc,noreset
+.endif
+
+.if defined(PROGEXITS) && ${PROGEXITS} != ""
+_PROGEXITS=-E ${PROGEXITS}
+.endif
+.if defined(PROGPORT) && ${PROGPORT} != ""
+_PROGPORT=-P ${PROGPORT}
+.endif
+
+PROGOPTS?=-p ${PART} -c ${PROGTYPE} ${_PROGPORT} ${_PROGEXITS} -q ${PROGEXTRA}
 
 .if !defined(SRCS)
 SRCS=	${PROG}.c