summaryrefslogtreecommitdiff
path: root/board/amcc/bamboo/flash.c
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2007-06-14 19:56:58 -0500
committerKim Phillips <kim.phillips@freescale.com>2007-06-14 19:56:58 -0500
commitb721ff745d3e5b4fe6bb8db430553d54dba4bd17 (patch)
tree8f267466c28352bac8e2f59358411d0860bb0bcf /board/amcc/bamboo/flash.c
parent5b1313fb2758ffce8b624457f777d8cc6709608d (diff)
parent9912121f7ed804ea58fd62f3f230b5dcfc357d88 (diff)
downloadu-boot-imx-b721ff745d3e5b4fe6bb8db430553d54dba4bd17.zip
u-boot-imx-b721ff745d3e5b4fe6bb8db430553d54dba4bd17.tar.gz
u-boot-imx-b721ff745d3e5b4fe6bb8db430553d54dba4bd17.tar.bz2
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'board/amcc/bamboo/flash.c')
-rw-r--r--board/amcc/bamboo/flash.c6
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]);