diff options
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/cramfs.c | 2 | ||||
-rw-r--r-- | cmd/flash.c | 34 | ||||
-rw-r--r-- | cmd/load.c | 4 | ||||
-rw-r--r-- | cmd/mem.c | 4 |
4 files changed, 22 insertions, 22 deletions
diff --git a/cmd/cramfs.c b/cmd/cramfs.c index c1034916c60..965ca4e60dd 100644 --- a/cmd/cramfs.c +++ b/cmd/cramfs.c @@ -31,7 +31,7 @@ #include <flash.h> -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH # define OFFSET_ADJUSTMENT 0 #else # define OFFSET_ADJUSTMENT (flash_info[id.num].start[0]) diff --git a/cmd/flash.c b/cmd/flash.c index 85d18bb2c53..b150940bf3a 100644 --- a/cmd/flash.c +++ b/cmd/flash.c @@ -25,7 +25,7 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, u8 *part_num, struct part_info **part); #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #include <flash.h> #include <mtd/cfi_flash.h> extern flash_info_t flash_info[]; /* info for FLASH chips */ @@ -271,11 +271,11 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last, return rcode; } -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH ulong bank; #endif @@ -283,7 +283,7 @@ static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) dataflash_print_info(); #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH if (argc == 1) { /* print info for all FLASH banks */ for (bank=0; bank <CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { printf ("\nBank # %ld: ", bank+1); @@ -301,13 +301,13 @@ static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } printf ("\nBank # %ld: ", bank); flash_print_info (&flash_info[bank-1]); -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ return 0; } static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH flash_info_t *info = NULL; ulong bank, addr_first, addr_last; int n, sect_first = 0, sect_last = 0; @@ -395,10 +395,10 @@ static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; #else return 0; -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ } -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH int flash_sect_erase (ulong addr_first, ulong addr_last) { flash_info_t *info; @@ -436,12 +436,12 @@ int flash_sect_erase (ulong addr_first, ulong addr_last) } return rcode; } -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int rcode = 0; -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH flash_info_t *info = NULL; ulong bank; int i, n, sect_first = 0, sect_last = 0; @@ -450,11 +450,11 @@ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct part_info *part; u8 dev_type, dev_num, pnum; #endif -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ #ifdef CONFIG_HAS_DATAFLASH int status; #endif -#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) +#if defined(CONFIG_MTD_NOR_FLASH) || defined(CONFIG_HAS_DATAFLASH) int p; ulong addr_first, addr_last; #endif @@ -462,7 +462,7 @@ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 3) return CMD_RET_USAGE; -#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) +#if defined(CONFIG_MTD_NOR_FLASH) || defined(CONFIG_HAS_DATAFLASH) if (strcmp(argv[1], "off") == 0) p = 0; else if (strcmp(argv[1], "on") == 0) @@ -489,7 +489,7 @@ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH if (strcmp(argv[2], "all") == 0) { for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { info = &flash_info[bank-1]; @@ -611,11 +611,11 @@ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_USAGE; rcode = flash_sect_protect (p, addr_first, addr_last); -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ return rcode; } -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH int flash_sect_protect (int p, ulong addr_first, ulong addr_last) { flash_info_t *info; @@ -664,7 +664,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) } return rcode; } -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ /**************************************************/ diff --git a/cmd/load.c b/cmd/load.c index 77c3359b29b..4597ec5618d 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -151,7 +151,7 @@ static ulong load_serial(long offset) case SREC_DATA3: case SREC_DATA4: store_addr = addr + offset; -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH if (addr2info(store_addr)) { int rc; @@ -971,7 +971,7 @@ static ulong load_serial_ymodem(ulong offset, int mode) store_addr = addr + offset; size += res; addr += res; -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH if (addr2info(store_addr)) { int rc; diff --git a/cmd/mem.c b/cmd/mem.c index ff6a7709d20..83d34faf2d8 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -396,7 +396,7 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH /* check if we are copying to Flash */ if ( (addr2info(dest) != NULL) #ifdef CONFIG_HAS_DATAFLASH @@ -436,7 +436,7 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Check if we are copying from DataFlash to RAM */ if (addr_dataflash(addr) && !addr_dataflash(dest) -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH && (addr2info(dest) == NULL) #endif ){ |