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

diff --git a/MAKEALL b/MAKEALL
index d6d5f5b4236cdb080fe8257454705cddcbe5419c..27f8bd166eaad1a36db604377e6a66c77262e1f1 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -393,6 +393,7 @@ LIST_85xx="         \
        MPC8536DS_NAND  \
        MPC8536DS_SDCARD        \
        MPC8536DS_SPIFLASH      \
+       MPC8536DS_36BIT \
        MPC8540ADS      \
        MPC8540EVAL     \
        MPC8541CDS      \
@@ -453,6 +454,7 @@ LIST_85xx="         \
 
 LIST_86xx="            \
        MPC8610HPCD     \
+       MPC8641HPCN_36BIT \
        MPC8641HPCN     \
        sbc8641d        \
        XPEDITE5170     \

diff --git a/board/evb64260/mpsc.c b/board/evb64260/mpsc.c
index 8c4a4c899028ccc714752e196e8608410eb615df..3164967fed7eaef6e786d3311cde51fdb0ef497a 100644 (file)
--- a/board/evb64260/mpsc.c
+++ b/board/evb64260/mpsc.c
@@ -88,7 +88,7 @@ static void galsdma_enable_rx(void);
 
 
 /* GT64240A errata: cant read MPSC/BRG registers... so make mirrors in ram for read/modify write */
-#define MIRROR_HACK ((struct _tag_mirror_hack *)&(gd->mirror_hack))
+#define MIRROR_HACK ((struct _tag_mirror_hack *)&(gd->mirror_hack[0]))
 
 #define GT_REG_WRITE_MIRROR_G(a,d) {MIRROR_HACK->a ## _M = d; GT_REG_WRITE(a,d);}
 #define GTREGREAD_MIRROR_G(a) (MIRROR_HACK->a ## _M)

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 7784d92b6f6178281be7da45522134c69916ce9f..37d056e005793c2bcd5607503ae72fd2abde4c8d 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -275,7 +275,7 @@ static void *ehci_alloc(size_t sz, size_t align)
                return NULL;
        }
 
-       memset(p, sz, 0);
+       memset(p, 0, sz);
        return p;
 }
 
@@ -350,7 +350,6 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
            (dev->parent->devnum << 16) | (0 << 8) | (0 << 0);
        qh->qh_endpt2 = cpu_to_hc32(endpt);
        qh->qh_overlay.qt_next = cpu_to_hc32(QT_NEXT_TERMINATE);
-       qh->qh_overlay.qt_altnext = cpu_to_hc32(QT_NEXT_TERMINATE);
 
        td = NULL;
        tdp = &qh->qh_overlay.qt_next;

diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 84de146e5dd1295068ba726bb699e86064fa41df..2db4784d3b1181a05f54ab2a615ff9963e80768e 100644 (file)
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -35,7 +35,7 @@
  *
  * Stolen from prepboot/bootldr.h, (C) 1998 Gabriel Paubert, paubert@iram.es
  *
- * Uses r14 to access the GOT
+ * Uses r12 to access the GOT
  */
 
 #define START_GOT                      \