nand: Embed mtd_info in struct nand_chip
nand_info[] is now an array of pointers, with the actual mtd_info instance embedded in struct nand_chip. This is in preparation for syncing the NAND code with Linux 4.6, which makes the same change to struct nand_chip. It's in a separate commit due to the large amount of changes required to accommodate the change to nand_info[]. Signed-off-by: Scott Wood <oss@buserror.net>
This commit is contained in:
@@ -212,7 +212,7 @@ void lcd_show_board_info(void)
|
||||
dram_size += gd->bd->bi_dram[i].size;
|
||||
nand_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
lcd_printf (" %ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20,
|
||||
nand_size >> 20 );
|
||||
|
||||
@@ -191,7 +191,7 @@ void lcd_show_board_info(void)
|
||||
dram_size += gd->bd->bi_dram[i].size;
|
||||
nand_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
flash_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
|
||||
|
||||
@@ -272,7 +272,7 @@ void lcd_show_board_info(void)
|
||||
dram_size += gd->bd->bi_dram[i].size;
|
||||
nand_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
lcd_printf (" %ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20,
|
||||
nand_size >> 20 );
|
||||
|
||||
@@ -124,7 +124,7 @@ void lcd_show_board_info(void)
|
||||
dram_size += gd->bd->bi_dram[i].size;
|
||||
nand_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
lcd_printf(" %ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20,
|
||||
nand_size >> 20);
|
||||
|
||||
@@ -151,7 +151,7 @@ void lcd_show_board_info(void)
|
||||
dram_size += gd->bd->bi_dram[i].size;
|
||||
nand_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
lcd_printf (" %ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20,
|
||||
nand_size >> 20 );
|
||||
|
||||
@@ -196,7 +196,7 @@ void lcd_show_board_info(void)
|
||||
dram_size += gd->bd->bi_dram[i].size;
|
||||
nand_size = 0;
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
lcd_printf(" %ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20,
|
||||
nand_size >> 20);
|
||||
|
||||
@@ -207,7 +207,7 @@ void lcd_show_board_info(void)
|
||||
nand_size = 0;
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
#endif
|
||||
lcd_printf("%ld MB SDRAM, %lld MB NAND\n",
|
||||
dram_size >> 20, nand_size >> 20);
|
||||
|
||||
@@ -191,7 +191,7 @@ void lcd_show_board_info(void)
|
||||
nand_size = 0;
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
#endif
|
||||
lcd_printf("%ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20, nand_size >> 20);
|
||||
|
||||
@@ -187,7 +187,7 @@ void lcd_show_board_info(void)
|
||||
nand_size = 0;
|
||||
#ifdef CONFIG_NAND_ATMEL
|
||||
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
|
||||
nand_size += nand_info[i].size;
|
||||
nand_size += nand_info[i]->size;
|
||||
#endif
|
||||
lcd_printf("%ld MB SDRAM, %ld MB NAND\n",
|
||||
dram_size >> 20, nand_size >> 20);
|
||||
|
||||
Reference in New Issue
Block a user