diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-06-04 22:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-06-04 22:59:44 +0200 |
| commit | c0c292b2852a12e9d93e99b3aaf5b0dac5f36fdc (patch) | |
| tree | 980a8236578172e3eb8dd680f3f0f2539d7d3ea7 /board/amcc/bamboo/flash.c | |
| parent | f61137937da9afb543a55ca44b7178f2feee34cf (diff) | |
| parent | e3cbe1f93c5722f8ebbad468e30c069a2b511097 (diff) | |
| download | u-boot-imx-c0c292b2852a12e9d93e99b3aaf5b0dac5f36fdc.zip u-boot-imx-c0c292b2852a12e9d93e99b3aaf5b0dac5f36fdc.tar.gz u-boot-imx-c0c292b2852a12e9d93e99b3aaf5b0dac5f36fdc.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'board/amcc/bamboo/flash.c')
| -rw-r--r-- | board/amcc/bamboo/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c index a30ab7a..8a2e832 100644 --- a/board/amcc/bamboo/flash.c +++ b/board/amcc/bamboo/flash.c @@ -53,7 +53,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ static unsigned long flash_addr_table[][CFG_MAX_FLASH_BANKS] = { {0x87800001, 0xFFF00000, 0xFFF80000}, /* 0:boot from small flash */ {0x00000000, 0x00000000, 0x00000000}, /* 1:boot from pci 66 */ - {0x00000000, 0x00000000, 0x00000000}, /* 2:boot from nand flash */ + {0x87800001, 0x00000000, 0x00000000}, /* 0:boot from nand flash */ {0x87F00000, 0x87F80000, 0xFFC00001}, /* 3:boot from big flash 33*/ {0x87F00000, 0x87F80000, 0xFFC00001}, /* 4:boot from big flash 66*/ {0x00000000, 0x00000000, 0x00000000}, /* 5:boot from */ @@ -134,10 +134,10 @@ unsigned long flash_init(void) flash_info[i].size = 0; /* check whether the address is 0 */ - if (flash_addr_table[index][i] == 0) { + if (flash_addr_table[index][i] == 0) continue; - } + DEBUGF("Detection bank %d...\n", i); /* call flash_get_size() to initialize sector address */ size_b[i] = flash_get_size((vu_long *) flash_addr_table[index][i], &flash_info[i]); |