diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:22:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:22:17 +0200 |
| commit | b65e86d8d832146600a28cb4f14f771533df4f35 (patch) | |
| tree | ed366e19f82547066cf5e40f6eaac75068da623b /board/esd | |
| parent | 69434e4c9485b442f441406c37030e8a85a42cfd (diff) | |
| parent | 3c29975e94eb050fdea1c4299c24f348e50b22a3 (diff) | |
| download | u-boot-imx-b65e86d8d832146600a28cb4f14f771533df4f35.zip u-boot-imx-b65e86d8d832146600a28cb4f14f771533df4f35.tar.gz u-boot-imx-b65e86d8d832146600a28cb4f14f771533df4f35.tar.bz2 | |
Merge branch 'next' of ../custodians into next
Diffstat (limited to 'board/esd')
| -rw-r--r-- | board/esd/apc405/apc405.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index 564ee00..52477d7 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -30,6 +30,7 @@ #include <command.h> #include <malloc.h> #include <flash.h> +#include <mtd/cfi_flash.h> #include <asm/4xx_pci.h> #include <pci.h> @@ -39,9 +40,6 @@ DECLARE_GLOBAL_DATA_PTR; extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); extern void lxt971_no_sleep(void); -extern ulong flash_get_size (ulong base, int banknum); - -int flash_banks = CONFIG_SYS_MAX_FLASH_BANKS_DETECT; /* fpga configuration data - gzip compressed and generated by bin2c */ const unsigned char fpgadata[] = @@ -185,7 +183,7 @@ int board_early_init_f (void) int board_early_init_r(void) { if (gd->board_type >= 8) - flash_banks = 1; + cfi_flash_num_flash_banks = 1; return 0; } |