summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-16 22:13:54 +0200
committerWolfgang Denk <wd@denx.de>2009-07-16 22:13:54 +0200
commitcd21a458da20f62807fedbed86b65f2d59d6b611 (patch)
treeff8c8f01a097a834030cb84f754c371d196677a1
parent10faafd5ff103ee493b6a05724eb605d09836d4a (diff)
parent9578718c1b085cac73017d834001bc5cb0b2f73f (diff)
downloadu-boot-imx-cd21a458da20f62807fedbed86b65f2d59d6b611.zip
u-boot-imx-cd21a458da20f62807fedbed86b65f2d59d6b611.tar.gz
u-boot-imx-cd21a458da20f62807fedbed86b65f2d59d6b611.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
-rw-r--r--drivers/mtd/cfi_mtd.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index c7e357b..34748dd 100644
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@@ -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