Changeset 9708

Show
Ignore:
Timestamp:
10/03/08 19:29:47
Author:
eb
Message:

USRP2 firmware fixes for EDK 10.1 microblaze toolchain. Firmware now builds
and runs correctly using these tools.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/usrp2/firmware/Makefile.common

    r9528 r9708  
    3232 
    3333 
    34 LINKER_SCRIPT = $(top_srcdir)/lib/microblaze.ld 
    35 #AM_LDFLAGS = -Wl,-T$(LINKER_SCRIPT) -Wl,-defsym -Wl,_STACK_SIZE=1024 
    36 #AM_LDFLAGS = -Wl,-T$(LINKER_SCRIPT) -Wl,-Map -Wl,$@.map 
    37 AM_LDFLAGS = -Wl,-T$(LINKER_SCRIPT) 
    38  
     34#LINKER_SCRIPT = $(top_srcdir)/lib/microblaze.ld 
     35#AM_LDFLAGS = -Wl,-T,$(LINKER_SCRIPT) -Wl,-defsym -Wl,_STACK_SIZE=1024 
     36#AM_LDFLAGS = -Wl,-T,$(LINKER_SCRIPT) -Wl,-Map -Wl,$@.map 
     37#AM_LDFLAGS = -Wl,-T,$(LINKER_SCRIPT) 
     38#AM_LDFLAGS = -Wl,-Map -Wl,$@.map -Wl,-defsym -Wl,_STACK_SIZE=2048 
     39AM_LDFLAGS = -Wl,-defsym -Wl,_STACK_SIZE=2048 
    3940 
    4041%.bin : % 

  • gnuradio/trunk/usrp2/firmware/lib/Makefile.am

    r9588 r9708  
    2323 
    2424libu2fw_a_SOURCES = \ 
     25        abort.c \ 
    2526        ad9510.c \ 
    2627        ad9777.c \ 
    …… 
    3536        ethernet.c \ 
    3637        eth_mac.c \ 
     38        exit.c \ 
    3739        hal_io.c \ 
    3840        hal_uart.c \ 

  • gnuradio/trunk/usrp2/firmware/lib/db_init.c

    r9528 r9708  
    212212  u2_fxpt_freq_t delta = target_freq - baseband_freq; 
    213213 
     214#if 0 
    214215  printf("calc_dxc_freq\n"); 
    215216  printf("  fs       = "); print_fxpt_freq(fs); newline(); 
    …… 
    217218  printf("  baseband = "); print_fxpt_freq(baseband_freq); newline(); 
    218219  printf("  delta    = "); print_fxpt_freq(delta); newline(); 
    219    
    220 #if 0 
    221   printf("--- printed as uint64_t ---\n"); 
    222   printf("  fs       = "); print_uint64(fs); newline(); 
    223   printf("  target   = "); print_uint64(target_freq); newline(); 
    224   printf("  baseband = "); print_uint64(baseband_freq); newline(); 
    225   printf("  delta    = "); print_uint64(delta); newline(); 
    226 #endif 
     220#endif   
    227221 
    228222  if (delta >= 0){ 
    …… 
    302296  //   v = (int) rint(target_freq / master_freq) * pow(2.0, 32.0); 
    303297 
    304   printf("compute_freq_control_word\n"); 
    305   printf("  target_freq = "); print_fxpt_freq(target_freq); newline(); 
     298  //printf("compute_freq_control_word\n"); 
     299  //printf("  target_freq = "); print_fxpt_freq(target_freq); newline(); 
    306300 
    307301  int32_t master_freq = 100000000;      // 100M 
    308302 
    309303  int32_t v = ((target_freq << 12)) / master_freq; 
    310   printf("  fcw = %d\n", v); 
     304  //printf("  fcw = %d\n", v); 
    311305 
    312306  *actual_freq = (v * (int64_t) master_freq) >> 12; 
    313307 
    314   printf("  actual = "); print_fxpt_freq(*actual_freq); newline(); 
     308  //printf("  actual = "); print_fxpt_freq(*actual_freq); newline(); 
    315309 
    316310  return v; 

  • gnuradio/trunk/usrp2/firmware/lib/u2_init.c

    r9587 r9708  
    4444  ok &= eeprom_read(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &u2_hw_rev_major, 1); 
    4545} 
    46  
    4746 
    4847/*