diff options
| author | Stefan Roese <sr@denx.de> | 2010-08-31 10:04:11 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2010-09-20 15:09:00 +0200 |
| commit | 3c29975e94eb050fdea1c4299c24f348e50b22a3 (patch) | |
| tree | 8b74cce0e08aa3ea7a893a0736267f8fca1b9871 /common/cmd_flash.c | |
| parent | ca5def3f30860a97cc76453eb846fffbde997035 (diff) | |
| download | talos-obmc-uboot-3c29975e94eb050fdea1c4299c24f348e50b22a3.tar.gz talos-obmc-uboot-3c29975e94eb050fdea1c4299c24f348e50b22a3.zip | |
cfi_flash: Remove uneccessary #ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
Now that the defines are moved to header files we don't need this
conditional compilation any more. Remove it.
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common/cmd_flash.c')
| -rw-r--r-- | common/cmd_flash.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/common/cmd_flash.c b/common/cmd_flash.c index ff43965e9c..2a02eb90d4 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -42,6 +42,8 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, #endif #ifndef CONFIG_SYS_NO_FLASH +#include <flash.h> +#include <mtd/cfi_flash.h> extern flash_info_t flash_info[]; /* info for FLASH chips */ /* @@ -417,11 +419,7 @@ int flash_sect_erase (ulong addr_first, ulong addr_last) { flash_info_t *info; ulong bank; -#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT - int s_first[CONFIG_SYS_MAX_FLASH_BANKS_DETECT], s_last[CONFIG_SYS_MAX_FLASH_BANKS_DETECT]; -#else int s_first[CONFIG_SYS_MAX_FLASH_BANKS], s_last[CONFIG_SYS_MAX_FLASH_BANKS]; -#endif int erased = 0; int planned; int rcode = 0; @@ -635,11 +633,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) { flash_info_t *info; ulong bank; -#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT - int s_first[CONFIG_SYS_MAX_FLASH_BANKS_DETECT], s_last[CONFIG_SYS_MAX_FLASH_BANKS_DETECT]; -#else int s_first[CONFIG_SYS_MAX_FLASH_BANKS], s_last[CONFIG_SYS_MAX_FLASH_BANKS]; -#endif int protected, i; int planned; int rcode; |
