aboutsummaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2014-07-17 11:50:50 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2014-07-23 07:37:32 -0700
commita6e18604befdb6a954542f7722c8d55424065621 (patch)
tree22168e6f4c41c931e38ccd07ff8881b56c8cd88a /images
parent7423d1691fff3af08f8e42e3e09d8c8d9ec99fe8 (diff)
downloaduhd-a6e18604befdb6a954542f7722c8d55424065621.tar.gz
uhd-a6e18604befdb6a954542f7722c8d55424065621.tar.bz2
uhd-a6e18604befdb6a954542f7722c8d55424065621.zip
OctoClock firmware upgrade, added host driver
* OctoClock can communicate with UHD over Ethernet * Can read NMEA strings from GPSDO and send to host * Added multi_usrp_clock class for clock devices * uhd::device can now filter to return only USRP devices or clock devices * New OctoClock bootloader can accept firmware download over Ethernet * Added octoclock_burn_eeprom,octoclock_firmware_burner utilities * Added test_clock_synch example to show clock API
Diffstat (limited to 'images')
-rw-r--r--images/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/images/Makefile b/images/Makefile
index 6b1cfcfc4..85501459a 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -289,13 +289,14 @@ endif
ifdef HAS_AVR_UTILS
_octoclock_fw_dir = $(TOP_FW_DIR)/octoclock
-_octoclock_fw_bin = $(BUILT_IMAGES_DIR)/octoclock_fw.hex
+_octoclock_fw_bin = $(BUILT_IMAGES_DIR)/octoclock_r4_fw.hex
IMAGES_LIST += $(_octoclock_fw_bin)
$(_octoclock_fw_bin): $(GLOBAL_DEPS)
- cd $(_octoclock_fw_dir) && make -f Makefile clean
- cd $(_octoclock_fw_dir) && make -f Makefile all
- cp $(TOP_FW_DIR)/octoclock/octoclock_fw.hex $@
+ cd $(_octoclock_fw_dir) && mkdir build
+ cd $(_octoclock_fw_dir)/build && cmake ..
+ cd $(_octoclock_fw_dir)/build && make
+ cp $(TOP_FW_DIR)/octoclock/build/octoclock_r4_fw.hex $@
endif
########################################################################