diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
| commit | 95cf7753c175e868d1aacaad378bfe74d9454200 (patch) | |
| tree | 2eef9c811655d7a1b4d0fb020db7fa5125a2adc7 /images/Makefile | |
| parent | 81c9f77306dc82f250bfb2871b8bd7db67a40085 (diff) | |
| parent | 89ae5f3f651cff22226e2b2c0ce0ed796dad4c71 (diff) | |
| download | uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.gz uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.bz2 uhd-95cf7753c175e868d1aacaad378bfe74d9454200.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl
Conflicts:
host/lib/transport/udp_simple.cpp
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_iface.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'images/Makefile')
| -rw-r--r-- | images/Makefile | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile index cfd7ff591..79e7b3362 100644 --- a/images/Makefile +++ b/images/Makefile @@ -78,12 +78,13 @@ $(_usrp1_fpga_4rx_rbf): cp $(_usrp1_fpga_dir)/std_4rx_0tx.rbf $@ ######################################################################## -# USRP2 firmware +# USRP2/2+ firmware ######################################################################## ifdef HAS_MB_GCC _usrp2_fw_dir = $(TOP_FW_DIR)/microblaze _usrp2_fw_bin = $(BUILT_IMAGES_DIR)/usrp2_fw.bin +_usrp2p_fw_bin = $(BUILT_IMAGES_DIR)/usrp2p_fw.bin IMAGES_LIST += $(_usrp2_fw_bin) $(_usrp2_fw_bin): @@ -91,7 +92,8 @@ $(_usrp2_fw_bin): cd $(_usrp2_fw_dir) && ./configure --host=mb make -C $(_usrp2_fw_dir) clean make -C $(_usrp2_fw_dir) all - cp $(_usrp2_fw_dir)/usrp2/usrp2_txrx_uhd.bin $@ + cp $(_usrp2_fw_dir)/usrp2/usrp2_txrx_uhd.bin $(_usrp2_fw_bin) + cp $(_usrp2_fw_dir)/usrp2p/usrp2p_txrx_uhd.bin $(_usrp2p_fw_bin) endif @@ -112,6 +114,22 @@ $(_usrp2_fpga_bin): endif ######################################################################## +# USRP2 fpga +######################################################################## +ifdef HAS_XTCLSH + +_usrp2p_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/u2plus +_usrp2p_fpga_bin = $(BUILT_IMAGES_DIR)/usrp2p_fpga.bin +IMAGES_LIST += $(_usrp2p_fpga_bin) + +$(_usrp2p_fpga_bin): + cd $(_usrp2p_fpga_dir) && make -f Makefile.udp clean + cd $(_usrp2p_fpga_dir) && make -f Makefile.udp bin + cp $(_usrp2p_fpga_dir)/build-ISE12/u2plus.bin $@ + +endif + +######################################################################## # Build rules ######################################################################## ##little rule to make the images directory |