diff options
| author | Josh Blum <josh@joshknows.com> | 2013-06-10 11:00:07 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2013-06-10 11:00:07 -0700 |
| commit | 3924a4d70ef11f4e13cd45617ccc2f7c12c2cd05 (patch) | |
| tree | e8395bbdd39e4a0bf9e844662b90c427289b27e2 /images | |
| parent | 91e0ed6d4d81ec036070b9ccd327fd496399d273 (diff) | |
| parent | 9fefb30f210f86c8c5964ca8ee80f63ad8856d02 (diff) | |
| download | uhd-3924a4d70ef11f4e13cd45617ccc2f7c12c2cd05.tar.gz uhd-3924a4d70ef11f4e13cd45617ccc2f7c12c2cd05.tar.bz2 uhd-3924a4d70ef11f4e13cd45617ccc2f7c12c2cd05.zip | |
Merge branch 'mergeme/octoclock'
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile index 562aa76c0..2e3bcfd26 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2010-2011 Ettus Research LLC +# Copyright 2010-2013 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -52,6 +52,12 @@ ifeq ($(shell xtclsh -h > /dev/null 2>&1 && echo $$?),0) HAS_XTCLSH=1 endif +ifeq ($(shell avr-gcc --version > /dev/null 2>&1 && echo $$?),0) + ifeq ($(shell avr-objcopy --version > /dev/null 2>&1 && echo $$?),0) + HAS_AVR_UTILS=1 + endif +endif + ######################################################################## # USRP1 and B100 firmware ######################################################################## @@ -277,6 +283,22 @@ $(_usrp_e110_fpga_bin): $(GLOBAL_DEPS) endif ######################################################################## +# OctoClock firmware +######################################################################## + +ifdef HAS_AVR_UTILS + +_octoclock_fw_dir = $(TOP_FW_DIR)/octoclock +_octoclock_fw_bin = $(BUILT_IMAGES_DIR)/octoclock_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 $@ +endif + +######################################################################## # Build rules ######################################################################## images: $(IMAGES_LIST) |