diff options
| author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 13:46:21 -0500 |
|---|---|---|
| committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 13:46:21 -0500 |
| commit | 037af3481edfb2b7a3fbed1dffd277df25f677b9 (patch) | |
| tree | 2c39b8891b4494298b7ee447c480645d96e13bdb /common/cmd_flash.c | |
| parent | ba999c531ed16ec749b2b6f4b0133cee38842b91 (diff) | |
Add Atmel AT91 patch version 1.5
This patch adds support for the following boards:
AT91RM9200-EK
AT91SAM9260-EK
AT91SAM9261-EK
AT91SAM9263-EK
AT91SAM9RL-EK
It was downloaded from http://www.linux4sam.org/twiki/pub/Linux4SAM/U-Boot/u-boot-1.1.5_atmel_1.5.diff.bz2
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'common/cmd_flash.c')
| -rw-r--r-- | common/cmd_flash.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/common/cmd_flash.c b/common/cmd_flash.c index cb1c5bb432b..5d6fffb9d17 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -43,6 +43,7 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, u8 *part_num, struct part_info **part); #endif +#ifndef CFG_NO_FLASH extern flash_info_t flash_info[]; /* info for FLASH chips */ /* @@ -277,6 +278,7 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last, return rcode; } +#endif /* CFG_NO_FLASH */ int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -285,7 +287,7 @@ int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #ifdef CONFIG_HAS_DATAFLASH dataflash_print_info(); #endif - +#ifndef CFG_NO_FLASH if (argc == 1) { /* print info for all FLASH banks */ for (bank=0; bank <CFG_MAX_FLASH_BANKS; ++bank) { printf ("\nBank # %ld: ", bank+1); @@ -303,11 +305,13 @@ int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } printf ("\nBank # %ld: ", bank); flash_print_info (&flash_info[bank-1]); +#endif /* CFG_NO_FLASH */ return 0; } int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { +#ifndef CFG_NO_FLASH flash_info_t *info; ulong bank, addr_first, addr_last; int n, sect_first, sect_last; @@ -399,8 +403,13 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) rcode = flash_sect_erase(addr_first, addr_last); return rcode; +#else + return 0; +#endif /* CFG_NO_FLASH */ + } +#ifndef CFG_NO_FLASH int flash_sect_erase (ulong addr_first, ulong addr_last) { flash_info_t *info; @@ -441,12 +450,19 @@ int flash_sect_erase (ulong addr_first, ulong addr_last) } return rcode; } +#endif /* CFG_NO_FLASH */ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { +#ifndef CFG_NO_FLASH flash_info_t *info; ulong bank, addr_first, addr_last; - int i, p, n, sect_first, sect_last; + int i, p, n, sect_first, sect_last; +#else + ulong addr_first, addr_last; + int p; +#endif + #if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) struct mtd_device *dev; struct part_info *part; @@ -488,7 +504,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } } #endif - +#ifndef CFG_NO_FLASH if (strcmp(argv[2], "all") == 0) { for (bank=1; bank<=CFG_MAX_FLASH_BANKS; ++bank) { info = &flash_info[bank-1]; @@ -613,10 +629,11 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } rcode = flash_sect_protect (p, addr_first, addr_last); +#endif /* CFG_NO_FLASH */ return rcode; } - +#ifndef CFG_NO_FLASH int flash_sect_protect (int p, ulong addr_first, ulong addr_last) { flash_info_t *info; @@ -669,7 +686,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) } return rcode; } - +#endif /* CFG_NO_FLASH */ /**************************************************/ #if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) |