From: kusy <kusy>
Date: Tue, 27 May 2008 18:21:43 +0000 (+0000)
Subject: changing default programmer to jflashmm
X-Git-Tag: release_tinyos_2_1_0_0~367
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=daeaa8d2d802c7624cd1042601f943eefe1499fa

changing default programmer to jflashmm
---

diff --git a/support/make/pxa27x/jflashmm.extra b/support/make/pxa27x/jflashmm.extra
index dbe36885..ecf883fb 100644
--- a/support/make/pxa27x/jflashmm.extra
+++ b/support/make/pxa27x/jflashmm.extra
@@ -4,12 +4,14 @@
 PROGRAM = jflashmm
 
 PROGRAMMER ?= jflashmm.exe
-PROGRAMMER_FLAGS = ""
+PROGRAMMER_FLAGS = bulbcx16
+POST_INSTALL_BIN_FLAGS = P 0x0
 PXA27X_JTAG_DEV ?= "JTAG CPU"
+#PXA27X_JTAG_DEV ?= "INTEL(R) JTAG CABLE"
 
 program: FORCE
 	@echo "    installing $(PLATFORM) binary using $(PROGRAM)"
-	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(INSTALL_BIN)
+	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(INSTALL_BIN) $(POST_INSTALL_BIN_FLAGS) 
 
 
 program_input: bin
diff --git a/support/make/pxa27x/pxa27x.rules b/support/make/pxa27x/pxa27x.rules
index c40d39d1..9ded955f 100644
--- a/support/make/pxa27x/pxa27x.rules
+++ b/support/make/pxa27x/pxa27x.rules
@@ -44,7 +44,8 @@ ifdef DEFAULT_LOCAL_GROUP
 PFLAGS += -DDEFINED_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP)
 endif
 
-DEFAULT_PROGRAM ?= xflash
+DEFAULT_PROGRAM ?= jflashmm
+
 
 BUILDLESS_DEPS += bytes
 
@@ -80,7 +81,7 @@ setid: FORCE
 
 
 bin: exe FORCE
-	$(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
+	@cmd () { echo "$$@"; $$@; }; if [ "${DEFAULT_PROGRAM}" = "xflash" ]; then $(XDB_SYMBOL_EXTRACT) $(MAIN_EXE); fi
 
 exe: exe0 bytes FORCE
 	@: