diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-20 21:20:24 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-20 21:20:24 +0200 |
| commit | d9d47d18e8cee8ae290218ce5d9669b9563073e3 (patch) | |
| tree | 5053e19b4f1e32035c339a861b688ee27d586f38 /board | |
| parent | 0ef911934fe63495f9d81e359d168b03bd770c1b (diff) | |
| parent | acfbbb90b27971abaca1800dba22b1dc60a33369 (diff) | |
| download | u-boot-imx-d9d47d18e8cee8ae290218ce5d9669b9563073e3.zip u-boot-imx-d9d47d18e8cee8ae290218ce5d9669b9563073e3.tar.gz u-boot-imx-d9d47d18e8cee8ae290218ce5d9669b9563073e3.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/amcc/sequoia/sequoia.c | 6 |
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); |