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

spl: nand: read only in the size of image_header on the first access

Browse source 
For the same reason as in commit 50c8d66d, all the remaining
CONFIG_SYS_NAND_PAGE_SIZE in common/spl/spl_nand.c can be replaced
with sizeof(*header).

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Masahiro Yamada 2014-07-10 20:43:16 +09:00 • committed by Tom Rini
parent 949bbd7c86
commit c13bb16757
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/spl/spl_nand.c
View file

@ -44,7 +44,7 @@ void spl_nand_load_image(void)
/* load linux */ /* load linux */
nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS, nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
CONFIG_SYS_NAND_PAGE_SIZE, (void *)header); sizeof(*header), (void *)header);
spl_parse_image_header(header); spl_parse_image_header(header);
if (header->ih_os == IH_OS_LINUX) { if (header->ih_os == IH_OS_LINUX) {
/* happy - was a linux */ /* happy - was a linux */
@ -62,13 +62,13 @@ void spl_nand_load_image(void)
#endif #endif
#ifdef CONFIG_NAND_ENV_DST #ifdef CONFIG_NAND_ENV_DST
nand_spl_load_image(CONFIG_ENV_OFFSET, nand_spl_load_image(CONFIG_ENV_OFFSET,
CONFIG_SYS_NAND_PAGE_SIZE, (void *)header); sizeof(*header), (void *)header);
spl_parse_image_header(header); spl_parse_image_header(header);
nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size, nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
(void *)spl_image.load_addr); (void *)spl_image.load_addr);
#ifdef CONFIG_ENV_OFFSET_REDUND #ifdef CONFIG_ENV_OFFSET_REDUND
nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
CONFIG_SYS_NAND_PAGE_SIZE, (void *)header); sizeof(*header), (void *)header);
spl_parse_image_header(header); spl_parse_image_header(header);
nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size, nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
(void *)spl_image.load_addr); (void *)spl_image.load_addr);