[U-Boot] [PATCH 1/1] NAND Re: mtdparts fails with NAND >= 4GB - Second try

[Scott Wood]

On Mon, Jan 31, 2011 at 06:56:48PM -0800, Aaron Williams wrote:
> Trying again submitting the patch.
> 
> Adds support for NAND flash chips that are 4GiB and larger.
> 
> Signed-off-by: Aaron Williams <aaron.williams at caviumnetworks.com>
> 
> diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c
> index 5481c88..26d24b0 100644
> --- a/common/cmd_mtdparts.c
> +++ b/common/cmd_mtdparts.c
> @@ -21,6 +21,11 @@
>   *   $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
>   *   Copyright 2002 SYSGO Real-Time Solutions GmbH
>   *
> + * (C) Copyright 2011
> + * Aaron Williams, Cavium Networks, Inc. <aaron.williams at caviumnetworks.com>
> + *
> + *   Added support for partitions and flash greater than or equal to 4GiB.
> + *
>   * See file CREDITS for list of people who contributed to this
>   * project.
>   *

Changelogs go in git, not at the top of the file.

> diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
> index dd394a8..105eb3f 100644
> --- a/drivers/mtd/cfi_flash.c
> +++ b/drivers/mtd/cfi_flash.c
> @@ -1162,10 +1162,10 @@ void flash_print_info (flash_info_t * info)
>  		info->name,
>  		(info->portwidth << 3), (info->chipwidth << 3));
>  	if (info->size < 1024*1024)
> -		printf ("  Size: %ld kB in %d Sectors\n",
> +		printf ("  Size: %ld KiB in %d Sectors\n",
>  			info->size >> 10, info->sector_count);
>  	else
> -		printf ("  Size: %ld MB in %d Sectors\n",
> +		printf ("  Size: %ld MiB in %d Sectors\n",
>  			info->size >> 20, info->sector_count);
>  	printf ("  ");
>  	switch (info->vendor) {
> @@ -1924,6 +1924,7 @@ ulong flash_get_size (phys_addr_t base, int banknum)
>  
>  		/* Do manufacturer-specific fixups */
>  		switch (info->manufacturer_id) {
> +		case 0x0000:
>  		case 0x0001:
>  			flash_fixup_amd(info, &qry);
>  			break;

This seems unrelated.

Otherwise, the patch looks good.  Whose tree should it go through?
It's not really a NAND patch, though NAND is the reason for it.

-Scott