diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
| commit | 4226748ddda610eafaf5c6c32be206c336232b80 (patch) | |
| tree | 93795f42993ba85ffe4b1d4b539bc72eccd638d5 /images | |
| parent | c2122833e25ffe6e8e6918874afe7a3c9a92bc87 (diff) | |
| parent | 24b07e1b0dbe8ab9d72c46f65c14c34e84347554 (diff) | |
| download | uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.gz uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.bz2 uhd-4226748ddda610eafaf5c6c32be206c336232b80.zip | |
Merge branch 'fpga_master' into uhd_master
Conflicts:
fpga/usrp1/toplevel/usrp_std/usrp_std.v
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/images/Makefile b/images/Makefile index 284fc302a..de7785cf9 100644 --- a/images/Makefile +++ b/images/Makefile @@ -98,9 +98,9 @@ _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 $@ + cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 clean + cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 bin + cp $(_usrp_b100_fpga_dir)/build-B100/B100bin $@ endif |