diff options
| author | jcorgan | 2008-09-11 02:04:40 +0000 |
|---|---|---|
| committer | jcorgan | 2008-09-11 02:04:40 +0000 |
| commit | 26e4afc44d2d0e77c2f6c41dff43555b3c9166e6 (patch) | |
| tree | e86892494c551bcb8e13a0fc7c3bb280a82be50f /usrp2/fpga/top/u2_rev2 | |
| parent | 8cb024901c66ff487f2724199d31b8acfde71078 (diff) | |
| download | gnuradio-26e4afc44d2d0e77c2f6c41dff43555b3c9166e6.tar.gz gnuradio-26e4afc44d2d0e77c2f6c41dff43555b3c9166e6.tar.bz2 gnuradio-26e4afc44d2d0e77c2f6c41dff43555b3c9166e6.zip | |
Merged r9505:9553 from old usrp2/trunk into trunk/usrp2
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9555 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/fpga/top/u2_rev2')
| -rw-r--r-- | usrp2/fpga/top/u2_rev2/Makefile | 17 | ||||
| -rw-r--r-- | usrp2/fpga/top/u2_rev2/u2_rev2.v | 2 |
2 files changed, 5 insertions, 14 deletions
diff --git a/usrp2/fpga/top/u2_rev2/Makefile b/usrp2/fpga/top/u2_rev2/Makefile index a5969d62e..84243baf8 100644 --- a/usrp2/fpga/top/u2_rev2/Makefile +++ b/usrp2/fpga/top/u2_rev2/Makefile @@ -87,6 +87,8 @@ control_lib/simple_uart.v \ control_lib/simple_uart_tx.v \ control_lib/simple_uart_rx.v \ control_lib/oneshot_2clk.v \ +control_lib/sd_spi.v \ +control_lib/sd_spi_wb.v \ coregen/fifo_xlnx_2Kx36_2clk.v \ coregen/fifo_xlnx_2Kx36_2clk.xco \ coregen/fifo_xlnx_512x36_2clk.v \ @@ -190,18 +192,8 @@ export SYNTHESIZE_PROPERTIES := \ "Use Synchronous Reset" Auto \ "Use Synchronous Set" Auto -#export TRANSLATE_PROPERTIES := \ -#"Macro Search Path" "$(SOURCE_ROOT)coregen/" -#export TRANSLATE_PROPERTIES := \ -#"Macro Search Path" "$(shell pwd)/../../coregen/" export TRANSLATE_PROPERTIES := \ -"Macro Search Path" "../../coregen/" - -QUICK_MAP_PROPERTIES := \ -"Allow Logic Optimization Across Hierarchy" TRUE \ -"Map to Input Functions" 4 \ -"Optimization Strategy (Cover Mode)" Speed \ -"Pack I/O Registers/Latches into IOBs" "For Inputs and Outputs" +"Macro Search Path" "$(shell pwd)/../../coregen/" export MAP_PROPERTIES := \ "Allow Logic Optimization Across Hierarchy" TRUE \ @@ -248,9 +240,6 @@ synth: bin: PROCESS_RUN="Generate Programming File" $(XTCLSH) $(ISE_HELPER) -quick: - PROCESS_RUN="Generate Programming File" MAP_PROPERTIES='$(QUICK_MAP_PROPERTIES)' $(XTCLSH) $(ISE_HELPER) - clean: rm -rf $(BUILD_DIR) diff --git a/usrp2/fpga/top/u2_rev2/u2_rev2.v b/usrp2/fpga/top/u2_rev2/u2_rev2.v index 65d3ad656..945ac6946 100644 --- a/usrp2/fpga/top/u2_rev2/u2_rev2.v +++ b/usrp2/fpga/top/u2_rev2/u2_rev2.v @@ -362,6 +362,8 @@ module u2_rev2 .cpld_din (cpld_din), .cpld_clk (cpld_clk), .cpld_detached (cpld_detached), + .por (~POR), + .config_success (config_success), .adc_a (adc_a_reg2), .adc_ovf_a (adc_ovf_a_reg2), .adc_on_a (adc_on_a), |