summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-29 23:03:47 +0200
committerWolfgang Denk <wd@denx.de>2010-06-29 23:03:47 +0200
commita8e2b04417b802a9baf86de9c2e06375135e666f (patch)
tree32b86ea6c84ae6a26294459c61977bca191c5b93
parent1f9d10f694f6f901a826a5b42fbfe914e2117971 (diff)
parent161e4ae46046282fde6a69a0f1f80965f2a1b6f4 (diff)
downloadu-boot-imx-a8e2b04417b802a9baf86de9c2e06375135e666f.zip
u-boot-imx-a8e2b04417b802a9baf86de9c2e06375135e666f.tar.gz
u-boot-imx-a8e2b04417b802a9baf86de9c2e06375135e666f.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/work
-rwxr-xr-xMAKEALL2
-rw-r--r--board/evb64260/mpsc.c2
-rw-r--r--drivers/usb/host/ehci-hcd.c3
-rw-r--r--include/ppc_asm.tmpl2
4 files changed, 5 insertions, 4 deletions
diff --git a/MAKEALL b/MAKEALL
index d6d5f5b..27f8bd1 100755
--- 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 8c4a4c8..3164967 100644
--- 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 7784d92..37d056e 100644
--- 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 84de146..2db4784 100644
--- 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 \