diff options
| author | Tom Rini <trini@ti.com> | 2013-08-12 08:54:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-12 08:54:32 -0400 |
| commit | 0daa1f698593fface63eacae7897fabe42cfd28e (patch) | |
| tree | d4543a1719b805329f70277ccb4bab3b4c293793 /drivers | |
| parent | b62af3df4c23e206441087800f3fd4c133d1586f (diff) | |
| parent | 5f93227ce02d9cafa11704c807a80dcbde129f8c (diff) | |
| download | blackbird-obmc-uboot-0daa1f698593fface63eacae7897fabe42cfd28e.tar.gz blackbird-obmc-uboot-0daa1f698593fface63eacae7897fabe42cfd28e.zip | |
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fpga/zynqpl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 8cc16fd2c2..14363c9a5b 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -23,6 +23,7 @@ #define DEVCFG_STATUS_DMA_CMD_Q_E 0x40000000 #define DEVCFG_STATUS_DMA_DONE_CNT_MASK 0x30000000 #define DEVCFG_STATUS_PCFG_INIT 0x00000010 +#define DEVCFG_MCTRL_PCAP_LPBK 0x00000010 #define DEVCFG_MCTRL_RFIFO_FLUSH 0x00000002 #define DEVCFG_MCTRL_WFIFO_FLUSH 0x00000001 @@ -31,7 +32,7 @@ #endif #ifndef CONFIG_SYS_FPGA_PROG_TIME -#define CONFIG_SYS_FPGA_PROG_TIME CONFIG_SYS_HZ /* 1 s */ +#define CONFIG_SYS_FPGA_PROG_TIME (CONFIG_SYS_HZ * 4) /* 4 s */ #endif int zynq_info(Xilinx_desc *desc) @@ -200,6 +201,9 @@ int zynq_load(Xilinx_desc *desc, const void *buf, size_t bsize) swap = SWAP_DONE; } + /* Clear loopback bit */ + clrbits_le32(&devcfg_base->mctrl, DEVCFG_MCTRL_PCAP_LPBK); + if (!partialbit) { zynq_slcr_devcfg_disable(); |
