4 files changed, 31 insertions, 57 deletions
diff --git a/usrp2/top/Makefile.common b/usrp2/top/Makefile.common
index 25c48d31a..02b1b9529 100644
--- a/usrp2/top/Makefile.common
+++ b/usrp2/top/Makefile.common
@@ -6,15 +6,10 @@
 # Constants
 ##################################################
 BASE_DIR = $(abspath ..)
-ISE_HELPER = xtclsh /home/matt/sourcerepo/mobfleet/system_board/fpga/scripts/ise_helper.tcl
-#ISE_HELPER = xtclsh $(BASE_DIR)/tcl/ise_helper.tcl
+ISE_HELPER = xtclsh $(BASE_DIR)/tcl/ise_helper.tcl
 ISE_FILE = $(BUILD_DIR)/$(TOP_MODULE).ise
-BIN_FILE = $(BUILD_DIR)/$(TOP_MODULE).bit
-MAKE_ACE = $(BUILD_DIR)/make_ace.cmd
-ACE_FILE = $(BUILD_DIR)/xilinx.sys
+BIN_FILE = $(BUILD_DIR)/$(TOP_MODULE).bin
 MCS_FILE = $(BUILD_DIR)/$(TOP_MODULE).mcs
-IMPACT_CMD = $(BUILD_DIR)/impact.cmd
-IMPACT_CDF = $(BUILD_DIR)/impact.cdf
 
 ##################################################
 # Global Targets
@@ -31,18 +26,12 @@ synth: $(ISE_FILE)
 
 bin: $(BIN_FILE)
 
-ace: $(ACE_FILE)
-
 mcs: $(MCS_FILE)
 
 clean:
 	$(RM) -r $(BUILD_DIR)
 
-XIL_IMPACT_USE_LIBUSB=1
-jtag-install: $(IMPACT_CMD)
-	impact -batch $<
-
-.PHONY: all proj check synth bin ace mcs clean jtag-install
+.PHONY: all proj check synth bin mcs clean
 
 ##################################################
 # Dependency Targets
@@ -56,29 +45,7 @@ $(BIN_FILE): $(ISE_FILE)
 	$(ISE_HELPER) "Generate Programming File"
 	touch $@
 
-$(MAKE_ACE): $(BASE_DIR)/scripts/make_ace.cmd.in
-	sed \
-		-e 's|@BUILD_DIR[@]|$(BUILD_DIR)|g' \
-		-e 's|@TOP_MODULE[@]|$(TOP_MODULE)|g' \
-		-e 's|@BIN_FILE[@]|$(BIN_FILE)|g' \
-	$< > $@
-
-$(ACE_FILE): $(BIN_FILE) $(MAKE_ACE)
-	@echo $@
-	impact -batch $(MAKE_ACE)
-
 $(MCS_FILE): $(BIN_FILE)
 	promgen -w -spi -p mcs -o $(MCS_FILE) -s 4096 -u 0 $(BIN_FILE)
 
-$(IMPACT_CDF): $(BASE_DIR)/scripts/impact.cdf.in
-	sed \
-		-e 's|@BIN_FILE[@]|$(BIN_FILE)|g' \
-	$< > $@
-
-$(IMPACT_CMD): $(BASE_DIR)/scripts/impact.cmd.in $(IMPACT_CDF)
-	sed \
-		-e 's|@PART_NAME[@]|xc5vsx50t|g' \
-		-e 's|@CDF_FILE[@]|$(IMPACT_CDF)|g' \
-	$< > $@
-
 .EXPORT_ALL_VARIABLES:
diff --git a/usrp2/top/tcl/ise_helper.tcl b/usrp2/top/tcl/ise_helper.tcl
index fe9db87af..a4bee76b8 100644
--- a/usrp2/top/tcl/ise_helper.tcl
+++ b/usrp2/top/tcl/ise_helper.tcl
@@ -40,12 +40,12 @@ proc set_props {process options} {
 	}
 }
 
-if [file isfile $env(PROJ_FILE)] {
-	puts ">>> Opening project: $env(PROJ_FILE)"
-	project open $env(PROJ_FILE)
+if [file isfile $env(ISE_FILE)] {
+	puts ">>> Opening project: $env(ISE_FILE)"
+	project open $env(ISE_FILE)
 } else {	
-	puts ">>> Creating project: $env(PROJ_FILE)"
-	project new $env(PROJ_FILE)
+	puts ">>> Creating project: $env(ISE_FILE)"
+	project new $env(ISE_FILE)
 	
 	##################################################
 	# Set the project properties
@@ -56,7 +56,6 @@ if [file isfile $env(PROJ_FILE)] {
 	# Add the sources
 	##################################################
 	foreach source $env(SOURCES) {
-		set source $env(SOURCE_ROOT)$source
 		puts ">>> Adding source to project: $source"
 		xfile add $source
 	}
@@ -78,9 +77,9 @@ if [file isfile $env(PROJ_FILE)] {
 	set_props "Generate Post-Place & Route Simulation Model" $env(SIM_MODEL_PROPERTIES)
 }
 
-if [string compare $env(PROCESS_RUN) ""] {
-	puts ">>> Running Process: $env(PROCESS_RUN)"
-	process run $env(PROCESS_RUN)
+if [string compare [lindex $argv 0] ""] {
+	puts ">>> Running Process: [lindex $argv 0]"
+	process run [lindex $argv 0]
 }
 
 project close
diff --git a/usrp2/top/u2_rev3/Makefile b/usrp2/top/u2_rev3/Makefile
index 86e5bf979..68c296b9b 100644
--- a/usrp2/top/u2_rev3/Makefile
+++ b/usrp2/top/u2_rev3/Makefile
@@ -2,6 +2,16 @@
 # Copyright 2008 Ettus Research LLC
 #
 
+##################################################
+# Project Setup
+##################################################
+TOP_MODULE = u2_rev3
+BUILD_DIR = $(abspath build$(ISE))
+
+##################################################
+# Include other makefiles
+##################################################
+
 include ../Makefile.common
 include ../../fifo/Makefile.srcs
 include ../../control_lib/Makefile.srcs
@@ -16,12 +26,6 @@ include ../../coregen/Makefile.srcs
 include ../../extram/Makefile.srcs
 
 ##################################################
-# Project Setup
-##################################################
-TOP_MODULE = u2_rev3
-BUILD_DIR = $(abspath build$(ISE))
-
-##################################################
 # Project Properties
 ##################################################
 PROJECT_PROPERTIES = \
diff --git a/usrp2/top/u2_rev3/Makefile.udp b/usrp2/top/u2_rev3/Makefile.udp
index 90a5d88be..9962887d4 100644
--- a/usrp2/top/u2_rev3/Makefile.udp
+++ b/usrp2/top/u2_rev3/Makefile.udp
@@ -2,6 +2,16 @@
 # Copyright 2008 Ettus Research LLC
 #
 
+##################################################
+# Project Setup
+##################################################
+TOP_MODULE = u2_rev3
+BUILD_DIR = $(abspath build-udp$(ISE))
+
+##################################################
+# Include other makefiles
+##################################################
+
 include ../Makefile.common
 include ../../fifo/Makefile.srcs
 include ../../control_lib/Makefile.srcs
@@ -16,12 +26,6 @@ include ../../coregen/Makefile.srcs
 include ../../extram/Makefile.srcs
 
 ##################################################
-# Project Setup
-##################################################
-TOP_MODULE = u2_rev3
-BUILD_DIR = $(abspath build-udp$(ISE))
-
-##################################################
 # Project Properties
 ##################################################
 PROJECT_PROPERTIES = \