Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
This commit is contained in:
commit
cd21a458da
@ -31,10 +31,17 @@
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/concat.h>
|
||||
|
||||
/* use CONFIG_SYS_MAX_FLASH_BANKS_DETECT if defined */
|
||||
#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
|
||||
# define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT
|
||||
#else
|
||||
# define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS
|
||||
#endif
|
||||
|
||||
extern flash_info_t flash_info[];
|
||||
|
||||
static struct mtd_info cfi_mtd_info[CONFIG_SYS_MAX_FLASH_BANKS];
|
||||
static char cfi_mtd_names[CONFIG_SYS_MAX_FLASH_BANKS][16];
|
||||
static struct mtd_info cfi_mtd_info[CFI_MAX_FLASH_BANKS];
|
||||
static char cfi_mtd_names[CFI_MAX_FLASH_BANKS][16];
|
||||
#ifdef CONFIG_MTD_CONCAT
|
||||
static char c_mtd_name[16];
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user