Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Mon, 4 Feb 2013 14:07:34 +0000 (09:07 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Feb 2013 14:14:22 +0000 (09:14 -0500)
1  2 
common/cmd_bdinfo.c
drivers/block/systemace.c

diff --combined common/cmd_bdinfo.c
@@@ -50,6 -50,25 +50,25 @@@ static void print_eth(int idx
        printf("%-12s= %s\n", name, val);
  }
  
+ __maybe_unused
+ static void print_eths(void)
+ {
+       struct eth_device *dev;
+       int i = 0;
+       do {
+               dev = eth_get_dev_by_index(i);
+               if (dev) {
+                       printf("eth%dname    = %s\n", i, dev->name);
+                       print_eth(i);
+                       i++;
+               }
+       } while (dev);
+       printf("current eth = %s\n", eth_get_name());
+       printf("ip_addr     = %s\n", getenv("ipaddr"));
+ }
  __maybe_unused
  static void print_lnum(const char *name, unsigned long long value)
  {
@@@ -195,10 -214,9 +214,9 @@@ int do_bdinfo(cmd_tbl_t *cmdtp, int fla
        print_num("sram size      ",    (ulong)bd->bi_sramsize);
  #endif
  #if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       print_eths();
  #endif
-       printf("baudrate    = %u bps\n", (ulong)bd->bi_baudrate);
+       printf("baudrate    = %u bps\n", bd->bi_baudrate);
        return 0;
  }
  
@@@ -366,20 -384,17 +384,19 @@@ int do_bdinfo(cmd_tbl_t *cmdtp, int fla
        }
  
  #if defined(CONFIG_CMD_NET)
-       print_eth(0);
-       printf("ip_addr     = %s\n", getenv("ipaddr"));
+       print_eths();
  #endif
        printf("baudrate    = %u bps\n", bd->bi_baudrate);
  #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
 -      print_num("TLB addr", gd->tlb_addr);
 +      print_num("TLB addr", gd->arch.tlb_addr);
  #endif
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
        print_num("irq_sp", gd->irq_sp);        /* irq stack pointer */
        print_num("sp start ", gd->start_addr_sp);
 +#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        print_num("FB base  ", gd->fb_base);
 +#endif
        /*
         * TODO: Currently only support for davinci SOC's is added.
         * Remove this check once all the board implement this.
@@@ -465,9 -480,7 +482,9 @@@ int do_bdinfo(cmd_tbl_t *cmdtp, int fla
        print_eth(0);
        printf("ip_addr     = %s\n", getenv("ipaddr"));
  #endif
 +#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        print_num("FB base  ", gd->fb_base);
 +#endif
        return 0;
  }
  
@@@ -65,8 -65,8 +65,8 @@@ static void ace_writew(u16 val, unsigne
                writeb(val, base + off);
                writeb(val >> 8, base + off + 1);
  #endif
-       }
-       out16(base + off, val);
+       } else
+               out16(base + off, val);
  }
  
  static u16 ace_readw(unsigned off)
@@@ -83,7 -83,7 +83,7 @@@
  }
  
  static unsigned long systemace_read(int dev, unsigned long start,
 -                                  unsigned long blkcnt, void *buffer);
 +                                      lbaint_t blkcnt, void *buffer);
  
  static block_dev_desc_t systemace_dev = { 0 };
  
@@@ -149,7 -149,7 +149,7 @@@ block_dev_desc_t *systemace_get_dev(in
   * number of blocks read. A zero return indicates an error.
   */
  static unsigned long systemace_read(int dev, unsigned long start,
 -                                  unsigned long blkcnt, void *buffer)
 +                                      lbaint_t blkcnt, void *buffer)
  {
        int retry;
        unsigned blk_countdown;