diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2011-04-22 11:45:40 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2011-04-22 11:45:40 -0700 |
| commit | 0366d6110761c6bb34c49a0f1dbadabafc92a997 (patch) | |
| tree | 86196bf9b00c6ffeea1b1b078753548888b8f9dd | |
| parent | 361300327fceb20a5256cc9c5e5c6096cdbcd014 (diff) | |
| download | uhd-0366d6110761c6bb34c49a0f1dbadabafc92a997.tar.gz uhd-0366d6110761c6bb34c49a0f1dbadabafc92a997.tar.bz2 uhd-0366d6110761c6bb34c49a0f1dbadabafc92a997.zip | |
N210: Minor rearranging of bootloader impl in txrx
| -rw-r--r-- | firmware/zpu/apps/txrx_uhd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/firmware/zpu/apps/txrx_uhd.c b/firmware/zpu/apps/txrx_uhd.c index 7a99303bf..fcccf6959 100644 --- a/firmware/zpu/apps/txrx_uhd.c +++ b/firmware/zpu/apps/txrx_uhd.c @@ -288,23 +288,24 @@ main(void) { u2_init(); #ifdef BOOTLOADER - spif_init(); - set_default_mac_addr(); - set_default_ip_addr(); putstr("\nUSRP N210 UDP bootloader\n"); #else putstr("\nTxRx-UHD-ZPU\n"); #endif - print_mac_addr(ethernet_mac_addr()); newline(); - print_ip_addr(get_ip_addr()); newline(); printf("FPGA compatibility number: %d\n", USRP2_FPGA_COMPAT_NUM); printf("Firmware compatibility number: %d\n", USRP2_FW_COMPAT_NUM); #ifdef BOOTLOADER //load the production FPGA image or firmware if appropriate + spif_init(); do_the_bootload_thing(); + set_default_mac_addr(); + set_default_ip_addr(); #endif + print_mac_addr(ethernet_mac_addr()); newline(); + print_ip_addr(get_ip_addr()); newline(); + //1) register the addresses into the network stack register_addrs(ethernet_mac_addr(), get_ip_addr()); pkt_ctrl_program_inspector(get_ip_addr(), USRP2_UDP_DSP0_PORT); |