diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-23 13:53:14 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-23 13:53:14 -0800 |
| commit | 18ce33d2286a428705bc19e5dc091f2d6a6d4d5b (patch) | |
| tree | c355fbde9d8804b29ab76bef7412874fe03955a1 /fpga/usrp2/top/Makefile.common | |
| parent | 30ce5acedd3e0dc6fc97d7597781a0a4828812f2 (diff) | |
| parent | 74bb6b39d9a677e6a7a41b6e3d62488aa265f706 (diff) | |
| download | uhd-18ce33d2286a428705bc19e5dc091f2d6a6d4d5b.tar.gz uhd-18ce33d2286a428705bc19e5dc091f2d6a6d4d5b.tar.bz2 uhd-18ce33d2286a428705bc19e5dc091f2d6a6d4d5b.zip | |
Merge branch 'fpga_next' into next
Conflicts:
fpga/usrp2/top/u1e_passthru/.gitignore
fpga/usrp2/top/u1e_passthru/Makefile
fpga/usrp2/top/u2plus/.gitignore
fpga/usrp2/top/u2plus/Makefile
usrp2/top/u1e_passthru/.gitignore
usrp2/top/u1e_passthru/Makefile
Diffstat (limited to 'fpga/usrp2/top/Makefile.common')
| -rw-r--r-- | fpga/usrp2/top/Makefile.common | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fpga/usrp2/top/Makefile.common b/fpga/usrp2/top/Makefile.common index 9a180d10e..6f855a070 100644 --- a/fpga/usrp2/top/Makefile.common +++ b/fpga/usrp2/top/Makefile.common @@ -13,8 +13,10 @@ else endif BASE_DIR = $(abspath ..) ISE_HELPER = xtclsh $(BASE_DIR)/tcl/ise_helper.tcl +SANITY_CHECKER = python $(BASE_DIR)/python/check_inout.py ISE_FILE = $(BUILD_DIR)/$(TOP_MODULE).$(ISE_EXT) BIN_FILE = $(BUILD_DIR)/$(TOP_MODULE).bin +BIT_FILE = $(BUILD_DIR)/$(TOP_MODULE).bit MCS_FILE = $(BUILD_DIR)/$(TOP_MODULE).mcs ################################################## @@ -25,12 +27,13 @@ all: bin proj: $(ISE_FILE) check: $(ISE_FILE) + $(SANITY_CHECKER) $(TOP_MODULE).v $(TOP_MODULE).ucf $(ISE_HELPER) "Check Syntax" synth: $(ISE_FILE) $(ISE_HELPER) "Synthesize - XST" -bin: $(BIN_FILE) +bin: check $(BIN_FILE) $(ISE_HELPER) "Generate Programming File" mcs: $(MCS_FILE) @@ -54,6 +57,6 @@ $(BIN_FILE): $(ISE_FILE) $$(SOURCES) $$(MAKEFILE_LIST) touch $@ $(MCS_FILE): $(BIN_FILE) - promgen -w -spi -p mcs -o $(MCS_FILE) -s 4096 -u 0 $(BIN_FILE) + promgen -w -spi -p mcs -o $(MCS_FILE) -s 4096 -u 0 $(BIT_FILE) .EXPORT_ALL_VARIABLES: |