Merge branch 'master' of /home/wd/git/u-boot/master/

diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c
index dca10be1b5ac31a78dd569be906777a0aca80867..bda361ead949ec5c63988729e6b3cd9f2ab15c1c 100644 (file)
--- a/board/esd/common/flash.c
+++ b/board/esd/common/flash.c
@@ -22,7 +22,9 @@
  */
 
 #include <common.h>
+#ifdef __PPC__
 #include <ppc4xx.h>
+#endif
 #include <asm/processor.h>
 
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */

diff --git a/board/freescale/m5275evb/Makefile b/board/freescale/m5275evb/Makefile
index f337a7563c5f0104d56ccf57f73172e97f8f62d5..74c252869824083832178a7e03b8201b76e0e81c 100644 (file)
--- a/board/freescale/m5275evb/Makefile
+++ b/board/freescale/m5275evb/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-OBJS   = $(BOARD).o mii.o
+COBJS  = $(BOARD).o mii.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))

diff --git a/board/idmr/mii.c b/board/idmr/mii.c
index f130e6e5368c09697235041bea2052fa92d372f2..78a7028bcfae36cff2240b198d0312d698e8d3d8 100644 (file)
--- a/board/idmr/mii.c
+++ b/board/idmr/mii.c
@@ -200,7 +200,7 @@ int mii_discover_phy(struct eth_device *dev)
 }
 #endif                         /* CFG_DISCOVER_PHY */
 
-int mii_init(void) __attribute__((weak,alias("__mii_init")));
+void mii_init(void) __attribute__((weak,alias("__mii_init")));
 
 void __mii_init(void)
 {

diff --git a/common/lcd.c b/common/lcd.c
index 3bbc7bafaf190d03ebff5faa6705d207658cfaf0..e3347ec93c646da23c2194a5e63cc631df6f078c 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -678,6 +678,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                /* Set color map */
                for (i=0; i<colors; ++i) {
                        bmp_color_table_entry_t cte = bmp->color_table[i];
+#if !defined(CONFIG_ATMEL_LCD)
                        ushort colreg =
                                ( ((cte.red)   << 8) & 0xf800) |
                                ( ((cte.green) << 3) & 0x07e0) |
@@ -691,6 +692,9 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                        cmap++;
 #elif defined(CONFIG_MPC823)
                        cmap--;
+#endif
+#else /* CONFIG_ATMEL_LCD */
+                       lcd_setcolreg(i, cte.red, cte.green, cte.blue);
 #endif
                }
        }
@@ -727,7 +731,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
        for (i = 0; i < height; ++i) {
                WATCHDOG_RESET();
                for (j = 0; j < width ; j++)
-#if defined(CONFIG_PXA250)
+#if defined(CONFIG_PXA250) || defined(CONFIG_ATMEL_LCD)
                        *(fb++) = *(bmap++);
 #elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200)
                        *(fb++)=255-*(bmap++);

diff --git a/doc/README.qemu_mips b/doc/README.qemu_mips
index 476c5e6899205bf004d6069450c6c15f94c9e8cc..c9ac3f307de5af5a13e8525a20b7632a623fd3a7 100644 (file)
--- a/doc/README.qemu_mips
+++ b/doc/README.qemu_mips
@@ -15,4 +15,4 @@ create image:
 # dd of=flash bs=1k count=4k if=/dev/zero
 # dd of=flash bs=1k conv=notrunc if=u-boot.bin
 start it:
-# qemu-system-mips -pflash flash -monitor null -nographic
+# qemu-system-mips -M mips -pflash flash -monitor null -nographic

diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 28d371d5e68f31b7926d12f1a74e7b7a8f3e7e91..6eba784b5c12844b13826cdddfb1758ce9286c78 100644 (file)
--- a/lib_m68k/time.c
+++ b/lib_m68k/time.c
@@ -199,6 +199,11 @@ unsigned long long get_ticks(void)
        return get_timer(0);
 }
 
+unsigned long usec2ticks(unsigned long usec)
+{
+       return get_timer(usec);
+}
+
 /*
  * This function is derived from PowerPC code (timebase clock frequency).
  * On M68K it returns the number of timer ticks per second.