aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2010-11-10 17:26:29 -0800
committerNick Foster <nick@nerdnetworks.org>2010-11-10 17:26:29 -0800
commitff836c0b686f3cb567031600dbe9d2895eb85ab4 (patch)
tree4f46780093f6d15386087c87c3334121d59ecab9
parente0b3b4e3dd9f22d27e9465bba0c978a488733aae (diff)
downloaduhd-ff836c0b686f3cb567031600dbe9d2895eb85ab4.tar.gz
uhd-ff836c0b686f3cb567031600dbe9d2895eb85ab4.tar.bz2
uhd-ff836c0b686f3cb567031600dbe9d2895eb85ab4.zip
U2P: Added U2P stuff to images/ Makefile
-rw-r--r--images/Makefile21
1 files changed, 19 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile
index cfd7ff591..8ae9de2d6 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,7 @@ $(_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 $(_usrp2p_fw_bin)
endif
@@ -112,6 +113,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