[Tinyos-commits] CVS: tinyos-1.x/tools/make/pxa27x install.extra, 1.2, 1.3 reinstall.extra, 1.2, 1.3 pxa27x.rules, 1.5, 1.6

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10487/pxa27x

Modified Files:
	install.extra reinstall.extra pxa27x.rules 
Log Message:
cleaned up some make dependency issues.  Also, eliminated setid since each node already has a hardware unique id

Index: install.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/install.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install.extra	10 Jun 2005 21:41:02 -0000	1.2
--- install.extra	23 Sep 2005 17:56:52 -0000	1.3
***************
*** 3,6 ****
  
  NODEID = $(INSTALL)
! BUILD_DEPS = setid bin bytes program
  
--- 3,6 ----
  
  NODEID = $(INSTALL)
! BUILD_DEPS = bin program
  

Index: reinstall.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/reinstall.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** reinstall.extra	10 Jun 2005 21:41:02 -0000	1.2
--- reinstall.extra	23 Sep 2005 17:56:52 -0000	1.3
***************
*** 3,7 ****
  
  NODEID = $(REINSTALL)
! BUILD_DEPS = setid program
  
  
--- 3,7 ----
  
  NODEID = $(REINSTALL)
! BUILD_DEPS = program
  
  

Index: pxa27x.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/pxa27x.rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pxa27x.rules	6 Sep 2005 18:24:34 -0000	1.5
--- pxa27x.rules	23 Sep 2005 17:56:52 -0000	1.6
***************
*** 11,15 ****
  HELP += $(PXA27X_HELP)
  
! GAS = xscale-elf-as
  OBJCOPY = xscale-elf-objcopy
  OBJDUMP = xscale-elf-objdump
--- 11,16 ----
  HELP += $(PXA27X_HELP)
  
! AS = xscale-elf-as
! ASFLAGS = -mcpu=iwmmxt -mfpu=softfpa
  OBJCOPY = xscale-elf-objcopy
  OBJDUMP = xscale-elf-objdump
***************
*** 26,34 ****
  ASSEMBLY_FILES += $(PLATFORM_DIR)/barecrt.s $(PLATFORM_DIR)/mmu_table.s $(PLATFORM_DIR)/util.s 
  ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
! LIBRARY_OBJS  =  $(PLATFORM_DIR)/lib/profile.o $(PLATFORM_DIR)/lib/queue.o
  
  OPTFLAGS ?= -O3 -g
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
  ifdef MSG_SIZE
  PFLAGS += -DTOSH_DATA_LENGTH=$(MSG_SIZE)
--- 27,38 ----
  ASSEMBLY_FILES += $(PLATFORM_DIR)/barecrt.s $(PLATFORM_DIR)/mmu_table.s $(PLATFORM_DIR)/util.s 
  ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
! # not quite ready yet MOTELIB = $(PLATFORM_DIR)/lib/libimote2.a
! MOTELIB =  $(PLATFORM_DIR)/lib/profile.o $(PLATFORM_DIR)/lib/queue.o
! 
  
  OPTFLAGS ?= -O3 -g
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
+ 
  ifdef MSG_SIZE
  PFLAGS += -DTOSH_DATA_LENGTH=$(MSG_SIZE)
***************
*** 39,44 ****
  BUILDLESS_DEPS += bytes
  
! # Use the 'if' function instead of the 'ifdef' construct because ifdef freaks
! # out with call in there.  I don't know why.
  $(if $(PROGRAM),,$(call TOSMake_include,pxa27x/$(INSTALL_PROGRAM).extra))
  
--- 43,47 ----
  BUILDLESS_DEPS += bytes
  
! #if PROGRAM is not defined, go get what we've defined as the install program
  $(if $(PROGRAM),,$(call TOSMake_include,pxa27x/$(INSTALL_PROGRAM).extra))
  
***************
*** 46,50 ****
  ifndef BUILD_DEPS
    ifeq ($(filter $(BUILDLESS_DEPS),$(GOALS)),)
!     BUILD_DEPS = bin bytes setid $(POST_BUILD_EXTRA_DEPS)
    endif
  endif
--- 49,53 ----
  ifndef BUILD_DEPS
    ifeq ($(filter $(BUILDLESS_DEPS),$(GOALS)),)
!     BUILD_DEPS = bin bytes $(POST_BUILD_EXTRA_DEPS)
    endif
  endif
***************
*** 53,57 ****
  	@cmd () { echo "$$@"; $$@; }; if [ x = x$(NODEID) ]; then cmd $(OBJCOPY) --output-target=binary $(MAIN_EXE) $(INSTALL_BIN); else cmd $(SET_ID) --objcopy $(OBJCOPY) --objdump $(OBJDUMP) --target binary $(MAIN_EXE) $(INSTALL_BIN) $(NODEID); fi
  
! bin: exe FORCE
  	$(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
  
--- 56,63 ----
  	@cmd () { echo "$$@"; $$@; }; if [ x = x$(NODEID) ]; then cmd $(OBJCOPY) --output-target=binary $(MAIN_EXE) $(INSTALL_BIN); else cmd $(SET_ID) --objcopy $(OBJCOPY) --objdump $(OBJDUMP) --target binary $(MAIN_EXE) $(INSTALL_BIN) $(NODEID); fi
  
! objcopy:
! 	$(OBJCOPY) --output-target=binary $(MAIN_EXE) $(INSTALL_BIN)
! 
! bin: exe objcopy FORCE
  	$(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
  
***************
*** 61,65 ****
  exe0: builddir asms library $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS) $(LIBRARY_OBJS)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
--- 67,71 ----
  exe0: builddir asms library $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS) $(MOTELIB)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
***************
*** 71,76 ****
  
  asms: 
! 	$(GAS) $(ASSEMBLY_FILES) -o $(BUILDDIR)/asms.o -mfpu=softfpa
! 
  library:
  	cd $(PLATFORM_DIR)/lib; make;
\ No newline at end of file
--- 77,81 ----
  
  asms: 
! 	$(AS) $(ASFLAGS) $(ASSEMBLY_FILES) -o $(BUILDDIR)/asms.o
  library:
  	cd $(PLATFORM_DIR)/lib; make;
\ No newline at end of file