diff options
| author | Stefan Roese <sr@denx.de> | 2007-06-01 16:15:34 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-06-01 16:15:34 +0200 |
| commit | f3679aa13d9f483adb38245a87ecd5c84f57a5d3 (patch) | |
| tree | 56099e57611527ba2460cd57f1f8af5c0b686a6e /board/amcc/bamboo/flash.c | |
| parent | 155a96478a0881e6da96cbbbcf34952d6a3b1b4b (diff) | |
| parent | 9d9096043e8f713d4bf1743d32e1459e6a11644b (diff) | |
| download | olio-uboot-2014.01-f3679aa13d9f483adb38245a87ecd5c84f57a5d3.tar.xz olio-uboot-2014.01-f3679aa13d9f483adb38245a87ecd5c84f57a5d3.zip | |
Merge with /home/stefan/git/u-boot/bamboo-nand
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 a30ab7ada..8a2e832cf 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]); |