GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 18:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix OneNAND ipl to read CONFIG_SYS_MONITOR_LEN

Browse source 
Currently OneNAND initial program loader (ipl) reads only block 0 ie 128KB.
However, u-boot image for apollon board is 195KB making the board
unbootable with OneNAND.

Fix ipl to read CONFIG_SYS_MONITOR_LEN.
CONFIG_SYS_MONITOR_LEN macro holds the U-Boot image size.

Signed-off-by: Rohit Hagargundgi <h.rohit@samsung.com>
Signed-off-by: Gangheyamoorthy   <moorthy.apg@samsung.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
apgmoorthy 2009-03-27 14:45:23 +05:30 • committed by Scott Wood
parent dfc91c3395
commit 69bcabb516
3 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
onenand_ipl/onenand_boot.c
View file

@ -36,7 +36,7 @@ void start_oneboot(void)
buf = (uchar *) CONFIG_SYS_LOAD_ADDR; buf = (uchar *) CONFIG_SYS_LOAD_ADDR;
onenand_read_block0(buf); onenand_read_block(buf);
((init_fnc_t *)CONFIG_SYS_LOAD_ADDR)(); ((init_fnc_t *)CONFIG_SYS_LOAD_ADDR)();

8
onenand_ipl/onenand_ipl.h
View file

@ -23,15 +23,13 @@
#include <linux/mtd/onenand_regs.h> #include <linux/mtd/onenand_regs.h>
#define onenand_readw(a) readw(a) #define onenand_readw(a) readw(THIS_ONENAND(a))
#define onenand_writew(v, a) writew(v, a) #define onenand_writew(v, a) writew(v, THIS_ONENAND(a))
#define THIS_ONENAND(a) (CONFIG_SYS_ONENAND_BASE + (a)) #define THIS_ONENAND(a) (CONFIG_SYS_ONENAND_BASE + (a))
#define READ_INTERRUPT() \ #define READ_INTERRUPT() \
onenand_readw(THIS_ONENAND(ONENAND_REG_INTERRUPT)) onenand_readw(THIS_ONENAND(ONENAND_REG_INTERRUPT))
#define ONENAND_PAGE_SIZE 2048 extern int onenand_read_block(unsigned char *buf);
extern int onenand_read_block0(unsigned char *buf);
#endif #endif

58
onenand_ipl/onenand_read.c
View file

@ -49,20 +49,20 @@ static inline int onenand_read_page(ulong block, ulong page,
#endif #endif
onenand_writew(onenand_block_address(block), onenand_writew(onenand_block_address(block),
THIS_ONENAND(ONENAND_REG_START_ADDRESS1)); ONENAND_REG_START_ADDRESS1);
onenand_writew(onenand_bufferram_address(block), onenand_writew(onenand_bufferram_address(block),
THIS_ONENAND(ONENAND_REG_START_ADDRESS2)); ONENAND_REG_START_ADDRESS2);
onenand_writew(onenand_sector_address(page), onenand_writew(onenand_sector_address(page),
THIS_ONENAND(ONENAND_REG_START_ADDRESS8)); ONENAND_REG_START_ADDRESS8);
onenand_writew(onenand_buffer_address(), onenand_writew(onenand_buffer_address(),
THIS_ONENAND(ONENAND_REG_START_BUFFER)); ONENAND_REG_START_BUFFER);
onenand_writew(ONENAND_INT_CLEAR, THIS_ONENAND(ONENAND_REG_INTERRUPT)); onenand_writew(ONENAND_INT_CLEAR, ONENAND_REG_INTERRUPT);
onenand_writew(ONENAND_CMD_READ, THIS_ONENAND(ONENAND_REG_COMMAND)); onenand_writew(ONENAND_CMD_READ, ONENAND_REG_COMMAND);
#ifndef __HAVE_ARCH_MEMCPY32 #ifndef __HAVE_ARCH_MEMCPY32
p = (unsigned long *) buf; p = (unsigned long *) buf;
@ -72,6 +72,10 @@ static inline int onenand_read_page(ulong block, ulong page,
while (!(READ_INTERRUPT() & ONENAND_INT_READ)) while (!(READ_INTERRUPT() & ONENAND_INT_READ))
continue; continue;
/* Check for invalid block mark */
if (page < 2 && (onenand_readw(ONENAND_SPARERAM) != 0xffff))
return 1;
#ifdef __HAVE_ARCH_MEMCPY32 #ifdef __HAVE_ARCH_MEMCPY32
/* 32 bytes boundary memory copy */ /* 32 bytes boundary memory copy */
memcpy32(buf, base, pagesize); memcpy32(buf, base, pagesize);
@ -89,25 +93,43 @@ static inline int onenand_read_page(ulong block, ulong page,
#define ONENAND_PAGES_PER_BLOCK 64 #define ONENAND_PAGES_PER_BLOCK 64
/** /**
* onenand_read_block - Read a block data to buf * onenand_read_block - Read CONFIG_SYS_MONITOR_LEN from begining
* of OneNAND, skipping bad blocks
* @return 0 on success * @return 0 on success
*/ */
int onenand_read_block0(unsigned char *buf) int onenand_read_block(unsigned char *buf)
{ {
int page, offset = 0; int block;
int pagesize = ONENAND_PAGE_SIZE; int page = ONENAND_START_PAGE, offset = 0;
int pagesize = 0, erase_shift = 0;
int erasesize = 0, nblocks = 0;
/* MLC OneNAND has 4KiB page size */ if (onenand_readw(ONENAND_REG_TECHNOLOGY)) {
if (onenand_readw(THIS_ONENAND(ONENAND_REG_TECHNOLOGY))) pagesize = 4096; /* MLC OneNAND has 4KiB pagesize */
pagesize <<= 1; erase_shift = 18;
} else {
pagesize = 2048;
erase_shift = 17;
}
erasesize = ONENAND_PAGES_PER_BLOCK * pagesize;
nblocks = (CONFIG_SYS_MONITOR_LEN + erasesize - 1) >> erase_shift;
/* NOTE: you must read page from page 1 of block 0 */ /* NOTE: you must read page from page 1 of block 0 */
/* read the block page by page*/ /* read the block page by page*/
for (page = ONENAND_START_PAGE; for (block = 0; block < nblocks; block++) {
page < ONENAND_PAGES_PER_BLOCK; page++) { for (; page < ONENAND_PAGES_PER_BLOCK; page++) {
if (onenand_read_page(block, page, buf + offset,
onenand_read_page(0, page, buf + offset, pagesize); pagesize)) {
offset += pagesize; /* This block is bad. Skip it
* and read next block */
offset -= page * pagesize;
nblocks++;
break;
}
offset += pagesize;
}
page = 0;
} }
return 0; return 0;