summaryrefslogtreecommitdiff
path: root/board/amcc
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-11-02 14:09:18 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-11-02 14:09:18 +0900
commit37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (patch)
tree93439a245bc837bec3ec9e812b775ebed730c2fa /board/amcc
parentd9abba8254c3e6b9a1d5c2e52c2d8088bbeb520f (diff)
parent66fca016057b1c6b697552cc7220ebada9d4f82d (diff)
downloadu-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.zip
u-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.tar.gz
u-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/amcc')
-rw-r--r--board/amcc/sequoia/sequoia.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c
index c523bca..b518aa7 100644
--- a/board/amcc/sequoia/sequoia.c
+++ b/board/amcc/sequoia/sequoia.c
@@ -155,7 +155,8 @@ int misc_init_r(void)
gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
gd->bd->bi_flashoffset = 0;
-#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
+#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) || \
+ defined(CONFIG_SYS_RAMBOOT)
mtdcr(EBC0_CFGADDR, PB3CR);
#else
mtdcr(EBC0_CFGADDR, PB0CR);
@@ -163,7 +164,8 @@ int misc_init_r(void)
pbcr = mfdcr(EBC0_CFGDATA);
size_val = ffs(gd->bd->bi_flashsize) - 21;
pbcr = (pbcr & 0x0001ffff) | gd->bd->bi_flashstart | (size_val << 17);
-#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
+#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) || \
+ defined(CONFIG_SYS_RAMBOOT)
mtdcr(EBC0_CFGADDR, PB3CR);
#else
mtdcr(EBC0_CFGADDR, PB0CR);