diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-23 13:50:37 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-23 13:50:37 -0800 |
| commit | 30ce5acedd3e0dc6fc97d7597781a0a4828812f2 (patch) | |
| tree | 28d010c0938121f587e1820849c34ee900e7f74b /images | |
| parent | 8ce75a3ca7a51f4bdee87d78a610a0f2519473ae (diff) | |
| parent | 13ae4786e091d5581baf31c9967dca822ef15e39 (diff) | |
| download | uhd-30ce5acedd3e0dc6fc97d7597781a0a4828812f2.tar.gz uhd-30ce5acedd3e0dc6fc97d7597781a0a4828812f2.tar.bz2 uhd-30ce5acedd3e0dc6fc97d7597781a0a4828812f2.zip | |
Merge branch 'usrp_e100' into next
Conflicts:
images/Makefile
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/images/Makefile b/images/Makefile index 79e7b3362..34943cc59 100644 --- a/images/Makefile +++ b/images/Makefile @@ -114,18 +114,18 @@ $(_usrp2_fpga_bin): endif ######################################################################## -# USRP2 fpga +# USRP-E100 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) +_usrp_e100_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/u1e +_usrp_e100_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_e100_fpga.bin +IMAGES_LIST += $(_usrp_e100_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 $@ +$(_usrp_e100_fpga_bin): + cd $(_usrp_e100_fpga_dir) && make clean + cd $(_usrp_e100_fpga_dir) && make bin + cp $(_usrp_e100_fpga_dir)/build/u1e.bin $@ endif |