diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-05 19:55:19 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-05 19:55:19 -0700 |
| commit | 13d735c65e40af23f978f96b5b418712976ab5f2 (patch) | |
| tree | 020be6fd66df9a9d8ed9f328fa7c50713b6daa71 /images | |
| parent | 9d50dea1c2f884835b606ccaa1444e5de96926cb (diff) | |
| parent | f740a51cc0737b07fd4906f8ca80683ec6e87faa (diff) | |
| download | uhd-13d735c65e40af23f978f96b5b418712976ab5f2.tar.gz uhd-13d735c65e40af23f978f96b5b418712976ab5f2.tar.bz2 uhd-13d735c65e40af23f978f96b5b418712976ab5f2.zip | |
Merge branch 'mb_eeprom'
Diffstat (limited to 'images')
| -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) |