diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-14 19:08:26 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-14 19:08:26 -0700 |
| commit | 3d771334a820cb54870cbca23eab49bb84571905 (patch) | |
| tree | a3087b435b9e84730007365ac4c3d5e22198b9ce | |
| parent | 5dfc458188538a32f95c05f860587d2c542e14c1 (diff) | |
| download | uhd-3d771334a820cb54870cbca23eab49bb84571905.tar.gz uhd-3d771334a820cb54870cbca23eab49bb84571905.tar.bz2 uhd-3d771334a820cb54870cbca23eab49bb84571905.zip | |
b100: added images to Makefile
| -rw-r--r-- | host/lib/usrp/usrp_b100/b100_impl.cpp | 4 | ||||
| -rw-r--r-- | images/Makefile | 24 |
2 files changed, 24 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp_b100/b100_impl.cpp b/host/lib/usrp/usrp_b100/b100_impl.cpp index 066831a92..772da8f42 100644 --- a/host/lib/usrp/usrp_b100/b100_impl.cpp +++ b/host/lib/usrp/usrp_b100/b100_impl.cpp @@ -58,7 +58,7 @@ static device_addrs_t b100_find(const device_addr_t &hint) std::string b100_fw_image; try{ b100_fw_image = find_image_path( - hint.has_key("fw")? hint["fw"] : "usrp_b100_fw_c2.ihx" + hint.has_key("fw")? hint["fw"] : "usrp_b100_fw.ihx" ); } catch(...){ @@ -129,7 +129,7 @@ static device::sptr b100_make(const device_addr_t &device_addr){ //extract the FPGA path for the B100 std::string b100_fpga_image = find_image_path( - device_addr.has_key("fpga")? device_addr["fpga"] : "usrp_b100_fpga_c3.bin" + device_addr.has_key("fpga")? device_addr["fpga"] : "usrp_b100_fpga.bin" ); //try to match the given device address with something on the USB bus diff --git a/images/Makefile b/images/Makefile index f2ba21bdc..4b0034bf0 100644 --- a/images/Makefile +++ b/images/Makefile @@ -52,13 +52,14 @@ ifeq ($(shell xtclsh -h > /dev/null 2>&1 && echo $$?),0) endif ######################################################################## -# USRP1 firmware +# USRP1 and B100 firmware ######################################################################## ifdef HAS_SDCC _usrp1_fw_dir = $(TOP_FW_DIR)/fx2 _usrp1_fw_ihx = $(BUILT_IMAGES_DIR)/usrp1_fw.ihx -IMAGES_LIST += $(_usrp1_fw_ihx) +_usrp_b100_fw_ihx = $(BUILT_IMAGES_DIR)/usrp_b100_fw.ihx +IMAGES_LIST += $(_usrp1_fw_ihx) $(_usrp_b100_fw_ihx) $(_usrp1_fw_ihx): $(GLOBAL_DEPS) cd $(_usrp1_fw_dir) && rm -rf build @@ -67,6 +68,9 @@ $(_usrp1_fw_ihx): $(GLOBAL_DEPS) cd $(_usrp1_fw_dir)/build && make cp $(_usrp1_fw_dir)/build/usrp1/usrp1_fw.ihx $@ +$(_usrp_b100_fw_ihx): $(_usrp1_fw_ihx) + cp $(_usrp1_fw_dir)/build/b100/b100_fw.ihx $(_usrp_b100_fw_ihx) + endif ######################################################################## @@ -84,6 +88,22 @@ $(_usrp1_fpga_4rx_rbf): $(GLOBAL_DEPS) cp $(_usrp1_fpga_dir)/std_4rx_0tx.rbf $@ ######################################################################## +# USRP-B100 fpga +######################################################################## +ifdef HAS_XTCLSH + +_usrp_b100_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/B100 +_usrp_b100_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_b100_fpga.bin +IMAGES_LIST += $(_usrp_b100_fpga_bin) + +$(_usrp_b100_fpga_bin): $(GLOBAL_DEPS) + cd $(_usrp_b100_fpga_dir) && make clean + cd $(_usrp_b100_fpga_dir) && make bin + cp $(_usrp_b100_fpga_dir)/build/u1plus.bin $@ + +endif + +######################################################################## # USRP2 and N Series firmware ######################################################################## ifdef HAS_ZPU_GCC |