diff options
| author | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
| commit | 805fa87f6d2366e2193f3d9eb1f793ad41ae1430 (patch) | |
| tree | 743278b9e271dc84670680a466ef2ebaabcbbce9 /arch/blackfin/lib/string.c | |
| parent | a661b99dbc35e725f229a7b8e189ca21304ba026 (diff) | |
| parent | da34aae5fba36c1f1989fdd41fffa723f300eaad (diff) | |
| download | talos-obmc-uboot-805fa87f6d2366e2193f3d9eb1f793ad41ae1430.tar.gz talos-obmc-uboot-805fa87f6d2366e2193f3d9eb1f793ad41ae1430.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes
Diffstat (limited to 'arch/blackfin/lib/string.c')
| -rw-r--r-- | arch/blackfin/lib/string.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/blackfin/lib/string.c b/arch/blackfin/lib/string.c index 44d8c6d906..5b7ac0b91a 100644 --- a/arch/blackfin/lib/string.c +++ b/arch/blackfin/lib/string.c @@ -128,10 +128,12 @@ static void dma_calc_size(unsigned long ldst, unsigned long lsrc, size_t count, unsigned long limit; #ifdef MSIZE - limit = 6; + /* The max memory DMA memory transfer size is 32 bytes. */ + limit = 5; *dshift = MSIZE_P; #else - limit = 3; + /* The max memory DMA memory transfer size is 4 bytes. */ + limit = 2; *dshift = WDSIZE_P; #endif @@ -170,7 +172,8 @@ void dma_memcpy_nocache(void *dst, const void *src, size_t count) mod = 1 << bpos; #ifdef PSIZE - dsize |= min(3, bpos) << PSIZE_P; + /* The max memory DMA peripheral transfer size is 4 bytes. */ + dsize |= min(2, bpos) << PSIZE_P; #endif /* Copy sram functions from sdram to sram */ |
