summaryrefslogtreecommitdiff
path: root/usrp/firmware
diff options
context:
space:
mode:
authorJosh Blum2010-04-15 12:01:51 -0700
committerJosh Blum2010-04-15 12:01:51 -0700
commit64c9d57de399bd0e42bb19d3f961be3355ec82c1 (patch)
treeef0f5115f2709105c2f9d125cf6e6fca607e2356 /usrp/firmware
parentec7bdb4c93c8046b7d80bdad9b151c990946b181 (diff)
parenta301c47751cb61116ae8f49f6b693b3ca6fbadc3 (diff)
downloadgnuradio-64c9d57de399bd0e42bb19d3f961be3355ec82c1.tar.gz
gnuradio-64c9d57de399bd0e42bb19d3f961be3355ec82c1.tar.bz2
gnuradio-64c9d57de399bd0e42bb19d3f961be3355ec82c1.zip
Merge branch 'master' of http://gnuradio.org/git/gnuradio into uhd
Diffstat (limited to 'usrp/firmware')
-rw-r--r--usrp/firmware/include/usrp_ids.h1
-rwxr-xr-xusrp/firmware/src/common/build_eeprom.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/usrp/firmware/include/usrp_ids.h b/usrp/firmware/include/usrp_ids.h
index dd5daed01..4152600bd 100644
--- a/usrp/firmware/include/usrp_ids.h
+++ b/usrp/firmware/include/usrp_ids.h
@@ -55,6 +55,7 @@
#define USB_PID_FSF_BDALE_8 0x0012 // Bdale Garbee <bdale@gag.com>
#define USB_PID_FSF_BDALE_9 0x0013 // Bdale Garbee <bdale@gag.com>
#define USB_PID_FSF_HPSDR_HERMES 0x0014 // HPSDR Hermes
+#define USB_PID_FSF_THINKRF 0x0015 // Catalin Patulea <catalin.patulea@thinkrf.com>
#define USB_PID_FSF_LBNL_UXO 0x0018 // http://recycle.lbl.gov/~ldoolitt/uxo/
diff --git a/usrp/firmware/src/common/build_eeprom.py b/usrp/firmware/src/common/build_eeprom.py
index ed9bb56a4..d73cbbc4f 100755
--- a/usrp/firmware/src/common/build_eeprom.py
+++ b/usrp/firmware/src/common/build_eeprom.py
@@ -146,7 +146,7 @@ def build_shell_script (out, ihx_filename, rev, prefix):
out.write ('#!/bin/sh\n')
out.write ('usrper -x load_firmware ' + prefix + '/share/usrp/rev%d/std.ihx\n' % rev)
- out.write ('sleep 1\n')
+ out.write ('sleep 2\n')
# print "len(image) =", len(image)
@@ -161,7 +161,7 @@ def build_shell_script (out, ihx_filename, rev, prefix):
(i2c_addr, rom_addr, ''.join (hex_image[0:l])))
hex_image = hex_image[l:]
rom_addr = rom_addr + l
- out.write ('sleep 1\n')
+ out.write ('sleep 2\n')
if __name__ == '__main__':
usage = "usage: %prog -p PREFIX -r REV [options] bootfile.ihx"