aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2011-04-21 16:11:26 -0700
committerNick Foster <nick@nerdnetworks.org>2011-04-21 16:12:53 -0700
commitf9080d0a3f7d6b0478150581a0c2e8af3f4e3c95 (patch)
treef49a4b7b13a41f71750aa977bfa43db6e4cc0240
parent03a609173ac90bf518b645893bd8211f02209846 (diff)
downloaduhd-f9080d0a3f7d6b0478150581a0c2e8af3f4e3c95.tar.gz
uhd-f9080d0a3f7d6b0478150581a0c2e8af3f4e3c95.tar.bz2
uhd-f9080d0a3f7d6b0478150581a0c2e8af3f4e3c95.zip
N210: UDP bootloader
-rw-r--r--firmware/zpu/usrp2p/bootloader/udp_bootloader.c5
-rwxr-xr-xhost/utils/usrp_n2xx_net_burner.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/firmware/zpu/usrp2p/bootloader/udp_bootloader.c b/firmware/zpu/usrp2p/bootloader/udp_bootloader.c
index 70dc941a5..00b54f364 100644
--- a/firmware/zpu/usrp2p/bootloader/udp_bootloader.c
+++ b/firmware/zpu/usrp2p/bootloader/udp_bootloader.c
@@ -167,12 +167,13 @@ main(void)
//1) register the addresses into the network stack
//TODO: make this a fixed IP address, don't depend on EEPROM
register_addrs(ethernet_mac_addr(), get_ip_addr());
+ pkt_ctrl_program_inspector(get_ip_addr(), USRP2_UDP_DSP0_PORT);
//2) register callbacks for udp ports we service
init_udp_listeners();
-#ifdef USRP2P
register_udp_listener(USRP2_UDP_UPDATE_PORT, handle_udp_fw_update_packet);
-#endif
+
+ pkt_ctrl_set_routing_mode(PKT_CTRL_ROUTING_MODE_SLAVE);
//4) setup ethernet hardware to bring the link up
ethernet_register_link_changed_callback(link_changed_callback);
diff --git a/host/utils/usrp_n2xx_net_burner.py b/host/utils/usrp_n2xx_net_burner.py
index 6c2939cd4..06af8c860 100755
--- a/host/utils/usrp_n2xx_net_burner.py
+++ b/host/utils/usrp_n2xx_net_burner.py
@@ -358,7 +358,7 @@ if __name__=='__main__':
if options.overwrite_safe and not options.read:
print("Are you REALLY, REALLY sure you want to overwrite the safe image? This is ALMOST ALWAYS a terrible idea.")
print("If your image is faulty, your USRP2+ will become a brick until reprogrammed via JTAG.")
- response = input("""Type "yes" to continue, or anything else to quit: """)
+ response = raw_input("""Type "yes" to continue, or anything else to quit: """)
if response != "yes": sys.exit(0)
burner = burner_socket(addr=options.addr)
@@ -367,7 +367,7 @@ if __name__=='__main__':
if options.fw:
file = options.fw
if os.path.isfile(file):
- response = input("File already exists -- overwrite? (y/n) ")
+ response = raw_input("File already exists -- overwrite? (y/n) ")
if response != "y": sys.exit(0)
size = FW_IMAGE_SIZE_BYTES
addr = SAFE_FW_IMAGE_LOCATION_ADDR if options.overwrite_safe else PROD_FW_IMAGE_LOCATION_ADDR