diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-12-14 15:35:59 -0800 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-12-14 15:35:59 -0800 |
commit | 14766b47af3a0629cd5482810bb9a9e5ff4b15d9 (patch) | |
tree | 003eaec3507cb2122265296e08e7b0fbadec6247 /firmware/microblaze/usrp2p/bootloader | |
parent | 03d200f9484d9706535142d9cc0336fcf02b369c (diff) | |
parent | 3d70da92fc539e254494be1fd75341c0a9bcf631 (diff) | |
download | uhd-14766b47af3a0629cd5482810bb9a9e5ff4b15d9.tar.gz uhd-14766b47af3a0629cd5482810bb9a9e5ff4b15d9.tar.bz2 uhd-14766b47af3a0629cd5482810bb9a9e5ff4b15d9.zip |
Merge branch 'zpu' of ettus.sourcerepo.com:ettus/uhdpriv into next
Diffstat (limited to 'firmware/microblaze/usrp2p/bootloader')
-rw-r--r-- | firmware/microblaze/usrp2p/bootloader/init_bootloader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/microblaze/usrp2p/bootloader/init_bootloader.c b/firmware/microblaze/usrp2p/bootloader/init_bootloader.c index 1d9d681d7..ab6c70a6b 100644 --- a/firmware/microblaze/usrp2p/bootloader/init_bootloader.c +++ b/firmware/microblaze/usrp2p/bootloader/init_bootloader.c @@ -56,7 +56,7 @@ void delay(uint32_t t) { int main(int argc, char *argv[]) { hal_disable_ints(); // In case we got here via jmp 0x0 output_regs->leds = 0xFF; - delay(500000); + delay(5000); output_regs->leds = 0x00; hal_uart_init(); spif_init(); @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) { if(is_valid_fpga_image(PROD_FPGA_IMAGE_LOCATION_ADDR)) { puts("Valid production FPGA image found. Attempting to boot."); set_safe_booted_flag(1); - delay(30000); //so serial output can finish + delay(300); //so serial output can finish icap_reload_fpga(PROD_FPGA_IMAGE_LOCATION_ADDR); } puts("No valid production FPGA image found.\nAttempting to load production firmware..."); |