sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

nand/fsl_elbc: shrink SPL a bit by converting out_be32() to __raw_writel() 

This is needed to make room for a bugfix on p1_p2_rdb_pc.  A sync is used
before the final write to LSOR that initiates the transaction, to ensure
all the other set up has been completed.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Scott Wood 2012-08-08 15:03:33 +00:00 committed by Andy Fleming
parent 7de8a7169e
commit 7b8f6685fb
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nand_spl/nand_boot_fsl_elbc.c
View File

@ -66,39 +66,42 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
if (large) { if (large) {
fmr |= FMR_ECCM; fmr |= FMR_ECCM;
out_be32(&regs->fcr, (NAND_CMD_READ0 << FCR_CMD0_SHIFT) | __raw_writel((NAND_CMD_READ0 << FCR_CMD0_SHIFT) |
(NAND_CMD_READSTART << FCR_CMD1_SHIFT)); (NAND_CMD_READSTART << FCR_CMD1_SHIFT),
out_be32(&regs->fir, &regs->fcr);
(FIR_OP_CW0 << FIR_OP0_SHIFT) | __raw_writel(
(FIR_OP_CA << FIR_OP1_SHIFT) | (FIR_OP_CW0 << FIR_OP0_SHIFT) |
(FIR_OP_PA << FIR_OP2_SHIFT) | (FIR_OP_CA << FIR_OP1_SHIFT) |
(FIR_OP_CW1 << FIR_OP3_SHIFT) | (FIR_OP_PA << FIR_OP2_SHIFT) |
(FIR_OP_RBW << FIR_OP4_SHIFT)); (FIR_OP_CW1 << FIR_OP3_SHIFT) |
(FIR_OP_RBW << FIR_OP4_SHIFT),
&regs->fir);
} else { } else {
out_be32(&regs->fcr, NAND_CMD_READ0 << FCR_CMD0_SHIFT); __raw_writel(NAND_CMD_READ0 << FCR_CMD0_SHIFT, &regs->fcr);
out_be32(&regs->fir, __raw_writel(
(FIR_OP_CW0 << FIR_OP0_SHIFT) | (FIR_OP_CW0 << FIR_OP0_SHIFT) |
(FIR_OP_CA << FIR_OP1_SHIFT) | (FIR_OP_CA << FIR_OP1_SHIFT) |
(FIR_OP_PA << FIR_OP2_SHIFT) | (FIR_OP_PA << FIR_OP2_SHIFT) |
(FIR_OP_RBW << FIR_OP3_SHIFT)); (FIR_OP_RBW << FIR_OP3_SHIFT),
&regs->fir);
} }
out_be32(&regs->fbcr, 0); __raw_writel(0, &regs->fbcr);
clrsetbits_be32(&regs->bank[0].br, BR_DECC, BR_DECC_CHK_GEN);
while (pos < uboot_size) { while (pos < uboot_size) {
int i = 0; int i = 0;
out_be32(&regs->fbar, offs >> block_shift); __raw_writel(offs >> block_shift, &regs->fbar);
do { do {
int j; int j;
unsigned int page_offs = (offs & (block_size - 1)) << 1; unsigned int page_offs = (offs & (block_size - 1)) << 1;
out_be32(&regs->ltesr, ~0); __raw_writel(~0, &regs->ltesr);
out_be32(&regs->lteatr, 0); __raw_writel(0, &regs->lteatr);
out_be32(&regs->fpar, page_offs); __raw_writel(page_offs, &regs->fpar);
out_be32(&regs->fmr, fmr); __raw_writel(fmr, &regs->fmr);
out_be32(&regs->lsor, 0); sync();
__raw_writel(0, &regs->lsor);
nand_wait(); nand_wait();
page_offs %= WINDOW_SIZE; page_offs %= WINDOW_SIZE;