aboutsummaryrefslogtreecommitdiff
path: root/board/amcc/bamboo/flash.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-12 00:22:49 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-12 00:22:49 +0200
commitdafba16e6fc1837381c8e74c4891ad6965cf54ab (patch)
treeaada3eb0493d66feda509795bf1e0e4264d78a7d /board/amcc/bamboo/flash.c
parent8f79e4c2da54cea11bb576870059fc1ba8847ccb (diff)
parent84286386a891633aae770bff24189c16a2546ed0 (diff)
downloadu-boot-linaro-stable-dafba16e6fc1837381c8e74c4891ad6965cf54ab.tar.gz
Merge with /home/wd/git/u-boot/masterLABEL_2005_08_12_0050
Diffstat (limited to 'board/amcc/bamboo/flash.c')
-rw-r--r--board/amcc/bamboo/flash.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c
index 97a4b988d..a30ab7ada 100644
--- a/board/amcc/bamboo/flash.c
+++ b/board/amcc/bamboo/flash.c
@@ -50,15 +50,16 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
/*
* Mark big flash bank (16 bit instead of 8 bit access) in address with bit 0
*/
-static unsigned long flash_addr_table[8][CFG_MAX_FLASH_BANKS] = {
+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 */
- {0x87800000, 0x87880000, 0xFF800001}, /* 3:boot from big flash 33*/
- {0x87800000, 0x87880000, 0xFF800001}, /* 4:boot from big flash 66*/
+ {0x87F00000, 0x87F80000, 0xFFC00001}, /* 3:boot from big flash 33*/
+ {0x87F00000, 0x87F80000, 0xFFC00001}, /* 4:boot from big flash 66*/
{0x00000000, 0x00000000, 0x00000000}, /* 5:boot from */
{0x00000000, 0x00000000, 0x00000000}, /* 6:boot from pci 66 */
{0x00000000, 0x00000000, 0x00000000}, /* 7:boot from */
+ {0x87C00001, 0xFFF00000, 0xFFF80000}, /* 0:boot from small flash */
};
/*
@@ -117,6 +118,10 @@ unsigned long flash_init(void)
index = 2;
break;
}
+ } else if (index == 0) {
+ if (in8(FPGA_SETTING_REG) & FPGA_SET_REG_OP_CODE_FLASH_ABOVE) {
+ index = 8; /* sram below op code flash -> new index 8 */
+ }
}
DEBUGF("\n");