[U-Boot] [PATCH v2] nand_spl: Fix large page nand_command()

[Wolfgang Denk]

Dear Alex Waterman,

In message <4D9CC6B0.6020608 at dawning.com> you wrote:
>
> This patch changes the large page nand_command() routine to use a word
> offset instead of a byte offset. The 'offs' argument gets divided by 2
> so that the offset passed to nand_command() is still by byte offset.
> Originally, the offset was not shifted and when too high an offset was
> requested the nand chip would attempt to read non-existent data.
> 
> Changes for v2:
> 
>  - Moved the offset calculation to outside of the OOB emulation code.
>  - Hopefully no more whitespace mangling.
> 
> Signed-off-by: Alex Waterman <awaterman at dawning.com>
> ---
>  nand_spl/nand_boot.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)

Unfortunately this patch breaks building of the canyonlands_nand and
glacier_nand configurations:

Configuring for canyonlands_nand - Board: canyonlands, Options: CANYONLANDS,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
ppc_6xx-ld: section .resetvec [e3003ffc -> e3003fff] overlaps section .bss.ndfc_cs [e3003ff4 -> e3004003]
make[1]: *** [/work/wd/tmp-ppc/nand_spl/u-boot-spl] Error 1
make: *** [nand_spl] Error 2
make: *** Waiting for unfinished jobs....
ppc_6xx-size: '/work/wd/tmp-ppc/u-boot': No such file

Configuring for glacier_nand - Board: canyonlands, Options: GLACIER,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
ppc_6xx-ld: section .resetvec [e3003ffc -> e3003fff] overlaps section .bss.ndfc_cs [e3003ff4 -> e3004003]
make[1]: *** [/work/wd/tmp-ppc/nand_spl/u-boot-spl] Error 1
make: *** [nand_spl] Error 2
make: *** Waiting for unfinished jobs....
ppc_6xx-size: '/work/wd/tmp-ppc/u-boot': No such file


Git bisect says:

65a9db7be0868be91ba81b9b5bf821de82e6d9b0 is the first bad commit
commit 65a9db7be0868be91ba81b9b5bf821de82e6d9b0
Author: Alex Waterman <awaterman at dawning.com>
Date:   Wed Apr 6 16:01:52 2011 -0400

    nand_spl: Fix large page nand_command()


Can you please provide a fix?  Thanks.


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Security is mostly a superstition. It does not  exist  in  nature...
Life is either a daring adventure or nothing."         - Helen Keller