fixing typo (VOLUMEFILE)

[tinyos-2.x.git] / support / make / pxa27x / pxa27x.rules

diff --git a/support/make/pxa27x/pxa27x.rules b/support/make/pxa27x/pxa27x.rules
index c40d39d1cee025d7f94b6e9de31a2a485e03bd07..7ceabce7f3e7375030caa76eb8718d9b6ddda24c 100644 (file)
--- a/support/make/pxa27x/pxa27x.rules
+++ b/support/make/pxa27x/pxa27x.rules
@@ -12,6 +12,7 @@ define PXA27X_HELP
 
    jflashmm : (default) use the Intel JFLASHMM tool to install
    xflash   : Use the Intel XFLASH tool to install
+   openocd  : Use openocd to install
 
 endef
 HELP += $(PXA27X_HELP)
@@ -44,7 +45,8 @@ ifdef DEFAULT_LOCAL_GROUP
 PFLAGS += -DDEFINED_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP)
 endif
 
-DEFAULT_PROGRAM ?= xflash
+DEFAULT_PROGRAM ?= jflashmm
+
 
 BUILDLESS_DEPS += bytes
 
@@ -59,8 +61,8 @@ build_storage: $(BUILDDIR)/StorageVolumes.h
 exe0: build_storage
 
 VOLUME_ALLOCATOR_FLAGS ?= 
-$(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
-       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
+$(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
+       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUME_FILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
 else
@@ -80,7 +82,7 @@ setid: FORCE
 
 
 bin: exe FORCE
-       $(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
+       @cmd () { echo "$$@"; $$@; }; if [ "${PROGRAM}" = "xflash" ]; then $(XDB_SYMBOL_EXTRACT) $(MAIN_EXE); fi
 
 exe: exe0 bytes FORCE
        @: