cfi_flash: Remove uneccessary #ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
PATCH 4/4 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 <[email protected]>
--- common/cmd_flash.c | 10 ++-------- drivers/mtd/cfi_mtd.c | 10 +--------- 2 files changed, 3 insertions(+), 17 deletions(-)
common/cmd_flash.c +2 -8
@@ -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;
drivers/mtd/cfi_mtd.c +1 -9
@@ -30,15 +30,7 @@#include <asm/errno.h> #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[]; +#include <mtd/cfi_flash.h> static struct mtd_info cfi_mtd_info[CFI_MAX_FLASH_BANKS ];static char cfi_mtd_names[CFI_MAX_FLASH_BANKS ][16 ];
Signature · 1 line
1.7.2.2