diff options
| author | Wolfgang Denk | 2010-09-21 09:22:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk | 2010-09-21 09:22:17 +0200 |
| commit | b65e86d8d832146600a28cb4f14f771533df4f35 (patch) | |
| tree | ed366e19f82547066cf5e40f6eaac75068da623b /common | |
| parent | 69434e4c9485b442f441406c37030e8a85a42cfd (diff) | |
| parent | 3c29975e94eb050fdea1c4299c24f348e50b22a3 (diff) | |
Merge branch 'next' of ../custodians into next
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 1 | ||||
| -rw-r--r-- | common/cmd_flash.c | 10 | ||||
| -rw-r--r-- | common/flash.c | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 4c6ed487037..46efd7741f7 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -77,6 +77,7 @@ static int image_info (unsigned long addr); #if defined(CONFIG_CMD_IMLS) #include <flash.h> +#include <mtd/cfi_flash.h> extern flash_info_t flash_info[]; /* info for FLASH chips */ static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #endif diff --git a/common/cmd_flash.c b/common/cmd_flash.c index ff43965e9c0..2a02eb90d4c 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; diff --git a/common/flash.c b/common/flash.c index 683978e473c..781cb9c4a2e 100644 --- a/common/flash.c +++ b/common/flash.c @@ -27,6 +27,7 @@ #include <flash.h> #if !defined(CONFIG_SYS_NO_FLASH) +#include <mtd/cfi_flash.h> extern flash_info_t flash_info[]; /* info for FLASH chips */ |