|
@@ -1,5 +1,6 @@
|
|
|
/*
|
|
|
* Copyright (C) 2014 Panasonic Corporation
|
|
|
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
|
|
|
*
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
|
*/
|
|
@@ -22,7 +23,6 @@ static void __iomem *denali_flash_reg =
|
|
|
(void __iomem *)CONFIG_SYS_NAND_REGS_BASE;
|
|
|
|
|
|
static const int flash_bank;
|
|
|
-static uint8_t page_buffer[NAND_MAX_PAGESIZE];
|
|
|
static int page_size, oob_size, pages_per_block;
|
|
|
|
|
|
static void index_addr(uint32_t address, uint32_t data)
|
|
@@ -144,15 +144,15 @@ static int nand_read_page(void *buf, int page)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int nand_block_isbad(int block)
|
|
|
+static int nand_block_isbad(void *buf, int block)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
|
- ret = nand_read_oob(page_buffer, block * pages_per_block);
|
|
|
+ ret = nand_read_oob(buf, block * pages_per_block);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
- return page_buffer[CONFIG_SYS_NAND_BAD_BLOCK_POS] != 0xff;
|
|
|
+ return *((uint8_t *)buf + CONFIG_SYS_NAND_BAD_BLOCK_POS) != 0xff;
|
|
|
}
|
|
|
|
|
|
/* nand_init() - initialize data to make nand usable by SPL */
|
|
@@ -184,7 +184,7 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
|
|
|
|
|
|
while (size) {
|
|
|
if (force_bad_block_check || page == 0) {
|
|
|
- ret = nand_block_isbad(block);
|
|
|
+ ret = nand_block_isbad(dst, block);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
@@ -196,24 +196,16 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
|
|
|
|
|
|
force_bad_block_check = 0;
|
|
|
|
|
|
- if (unlikely(column || size < page_size)) {
|
|
|
- /* Partial page read */
|
|
|
- ret = nand_read_page(page_buffer,
|
|
|
- block * pages_per_block + page);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
+ ret = nand_read_page(dst, block * pages_per_block + page);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
|
|
|
- readlen = min(page_size - column, (int)size);
|
|
|
- memcpy(dst, page_buffer, readlen);
|
|
|
+ readlen = min(page_size - column, (int)size);
|
|
|
|
|
|
+ if (unlikely(column)) {
|
|
|
+ /* Partial page read */
|
|
|
+ memmove(dst, dst + column, readlen);
|
|
|
column = 0;
|
|
|
- } else {
|
|
|
- ret = nand_read_page(dst,
|
|
|
- block * pages_per_block + page);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
-
|
|
|
- readlen = page_size;
|
|
|
}
|
|
|
|
|
|
size -= readlen;
|