diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-10 12:15:35 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-10 12:15:35 -0800 |
| commit | fb0cdbc553d288402ee7939dc72f4368eb9e8e1b (patch) | |
| tree | e20003155af08428448a7834a82d259f3b68717d /images/Makefile | |
| parent | 8fe1e7b29aacce7f75ae36e81706bbde02749b97 (diff) | |
| parent | 8c434f7d63aca25b55d6d13dffcc1d7037261d4f (diff) | |
| download | uhd-fb0cdbc553d288402ee7939dc72f4368eb9e8e1b.tar.gz uhd-fb0cdbc553d288402ee7939dc72f4368eb9e8e1b.tar.bz2 uhd-fb0cdbc553d288402ee7939dc72f4368eb9e8e1b.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p-next
Conflicts:
firmware/microblaze/lib/u2_init.c
host/lib/usrp/usrp2/clock_ctrl.cpp
host/lib/usrp/usrp2/fw_common.h
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_iface.cpp
host/lib/usrp/usrp2/usrp2_iface.hpp
Diffstat (limited to 'images/Makefile')
| -rw-r--r-- | images/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/images/Makefile b/images/Makefile index 57277e787..cfd7ff591 100644 --- a/images/Makefile +++ b/images/Makefile @@ -55,11 +55,11 @@ _usrp1_fw_ihx = $(BUILT_IMAGES_DIR)/usrp1_fw.ihx IMAGES_LIST += $(_usrp1_fw_ihx) $(_usrp1_fw_ihx): - cd $(_usrp1_fw_dir) && ./bootstrap - cd $(_usrp1_fw_dir) && ./configure - make -C $(_usrp1_fw_dir) clean - make -C $(_usrp1_fw_dir) all - cp $(_usrp1_fw_dir)/src/usrp1/std.ihx $@ + cd $(_usrp1_fw_dir) && rm -rf build + cd $(_usrp1_fw_dir) && mkdir build + cd $(_usrp1_fw_dir)/build && cmake ../ + cd $(_usrp1_fw_dir)/build && make + cp $(_usrp1_fw_dir)/build/usrp1/usrp1_fw.ihx $@ endif @@ -119,6 +119,7 @@ $(BUILT_IMAGES_DIR): mkdir $@ images: $(BUILT_IMAGES_DIR) $(IMAGES_LIST) + chmod -x $(BUILT_IMAGES_DIR)/* clean: $(RM) -rf $(BUILT_IMAGES_DIR) |