mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-17 12:41:32 +00:00
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
This commit is contained in:
commit
6e94258e25
3 changed files with 19 additions and 0 deletions
|
@ -23,6 +23,7 @@ Xilinx_desc fpga;
|
|||
|
||||
/* It can be done differently */
|
||||
Xilinx_desc fpga010 = XILINX_XC7Z010_DESC(0x10);
|
||||
Xilinx_desc fpga015 = XILINX_XC7Z015_DESC(0x15);
|
||||
Xilinx_desc fpga020 = XILINX_XC7Z020_DESC(0x20);
|
||||
Xilinx_desc fpga030 = XILINX_XC7Z030_DESC(0x30);
|
||||
Xilinx_desc fpga045 = XILINX_XC7Z045_DESC(0x45);
|
||||
|
@ -40,6 +41,9 @@ int board_init(void)
|
|||
case XILINX_ZYNQ_7010:
|
||||
fpga = fpga010;
|
||||
break;
|
||||
case XILINX_ZYNQ_7015:
|
||||
fpga = fpga015;
|
||||
break;
|
||||
case XILINX_ZYNQ_7020:
|
||||
fpga = fpga020;
|
||||
break;
|
||||
|
|
|
@ -187,6 +187,16 @@ int zynq_load(Xilinx_desc *desc, const void *buf, size_t bsize)
|
|||
if ((u32)buf != ALIGN((u32)buf, ARCH_DMA_MINALIGN)) {
|
||||
u32 *new_buf = (u32 *)ALIGN((u32)buf, ARCH_DMA_MINALIGN);
|
||||
|
||||
/*
|
||||
* This might be dangerous but permits to flash if
|
||||
* ARCH_DMA_MINALIGN is greater than header size
|
||||
*/
|
||||
if (new_buf > buf_start) {
|
||||
debug("%s: Aligned buffer is after buffer start\n",
|
||||
__func__);
|
||||
new_buf -= ARCH_DMA_MINALIGN;
|
||||
}
|
||||
|
||||
printf("%s: Align buffer at %x to %x(swap %d)\n", __func__,
|
||||
(u32)buf_start, (u32)new_buf, swap);
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ extern int zynq_dump(Xilinx_desc *desc, const void *buf, size_t bsize);
|
|||
extern int zynq_info(Xilinx_desc *desc);
|
||||
|
||||
#define XILINX_ZYNQ_7010 0x2
|
||||
#define XILINX_ZYNQ_7015 0x1b
|
||||
#define XILINX_ZYNQ_7020 0x7
|
||||
#define XILINX_ZYNQ_7030 0xc
|
||||
#define XILINX_ZYNQ_7045 0x11
|
||||
|
@ -24,6 +25,7 @@ extern int zynq_info(Xilinx_desc *desc);
|
|||
|
||||
/* Device Image Sizes */
|
||||
#define XILINX_XC7Z010_SIZE 16669920/8
|
||||
#define XILINX_XC7Z015_SIZE 28085344/8
|
||||
#define XILINX_XC7Z020_SIZE 32364512/8
|
||||
#define XILINX_XC7Z030_SIZE 47839328/8
|
||||
#define XILINX_XC7Z045_SIZE 106571232/8
|
||||
|
@ -33,6 +35,9 @@ extern int zynq_info(Xilinx_desc *desc);
|
|||
#define XILINX_XC7Z010_DESC(cookie) \
|
||||
{ xilinx_zynq, devcfg, XILINX_XC7Z010_SIZE, NULL, cookie, "7z010" }
|
||||
|
||||
#define XILINX_XC7Z015_DESC(cookie) \
|
||||
{ xilinx_zynq, devcfg, XILINX_XC7Z015_SIZE, NULL, cookie, "7z015" }
|
||||
|
||||
#define XILINX_XC7Z020_DESC(cookie) \
|
||||
{ xilinx_zynq, devcfg, XILINX_XC7Z020_SIZE, NULL, cookie, "7z020" }
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue