diff options
| author | Tom Rini <trini@ti.com> | 2013-11-06 16:11:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-06 16:11:34 -0500 |
| commit | 76a224104bc9c0147385da92fd78116ba4913b90 (patch) | |
| tree | e3975b128f67406ebab68dc5e1f5c61f635b5cec /drivers | |
| parent | edabc1bc6def0ec2b618d779964d2a2c554d7faf (diff) | |
| parent | 32d7cdd366a1516fa498464c261851f3a76a62ef (diff) | |
| download | u-boot-imx-76a224104bc9c0147385da92fd78116ba4913b90.zip u-boot-imx-76a224104bc9c0147385da92fd78116ba4913b90.tar.gz u-boot-imx-76a224104bc9c0147385da92fd78116ba4913b90.tar.bz2 | |
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fpga/zynqpl.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 717c039..1effbad 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -10,6 +10,7 @@ #include <common.h> #include <asm/io.h> #include <zynqpl.h> +#include <asm/sizes.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> @@ -177,8 +178,14 @@ int zynq_load(Xilinx_desc *desc, const void *buf, size_t bsize) return FPGA_FAIL; } - if ((u32)buf_start & 0x3) { - u32 *new_buf = (u32 *)((u32)buf & ~0x3); + if ((u32)buf < SZ_1M) { + printf("%s: Bitstream has to be placed up to 1MB (%x)\n", + __func__, (u32)buf); + return FPGA_FAIL; + } + + if ((u32)buf != ALIGN((u32)buf, ARCH_DMA_MINALIGN)) { + u32 *new_buf = (u32 *)ALIGN((u32)buf, ARCH_DMA_MINALIGN); printf("%s: Align buffer at %x to %x(swap %d)\n", __func__, (u32)buf_start, (u32)new_buf, swap); @@ -284,6 +291,10 @@ int zynq_load(Xilinx_desc *desc, const void *buf, size_t bsize) debug("%s: Source = 0x%08X\n", __func__, (u32)buf); debug("%s: Size = %zu\n", __func__, bsize); + /* flush(clean & invalidate) d-cache range buf */ + flush_dcache_range((u32)buf, (u32)buf + + roundup(bsize, ARCH_DMA_MINALIGN)); + /* Set up the transfer */ writel((u32)buf | 1, &devcfg_base->dma_src_addr); writel(0xFFFFFFFF, &devcfg_base->dma_dst_addr); |