summaryrefslogtreecommitdiff
path: root/board/mpc8266ads/flash.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-05-22 22:52:13 +0000
committerwdenk <wdenk>2003-05-22 22:52:13 +0000
commit5d232d0e7ea982d859d028ab482d95eb68460b19 (patch)
treea02c773fa4be5687f8f97d053ebd9afebbfaa54f /board/mpc8266ads/flash.c
parentc8c3a8be2dd09e51d7dc33f431e3a638ac5688f2 (diff)
downloadu-boot-imx-5d232d0e7ea982d859d028ab482d95eb68460b19.zip
u-boot-imx-5d232d0e7ea982d859d028ab482d95eb68460b19.tar.gz
u-boot-imx-5d232d0e7ea982d859d028ab482d95eb68460b19.tar.bz2
* Patch by Dave Ellis, 22 May 2003:
Fix problem with only partially cleared .bss segment * Patch by Rune Torgersen, 12 May 2003: get PCI to work on a MPC8266ADS board; incorporate change to cpu/mpc8260/pci.c to enable overrides of PCI memory parameters
Diffstat (limited to 'board/mpc8266ads/flash.c')
-rw-r--r--board/mpc8266ads/flash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/mpc8266ads/flash.c b/board/mpc8266ads/flash.c
index 5ec6e33..b876d1c 100644
--- a/board/mpc8266ads/flash.c
+++ b/board/mpc8266ads/flash.c
@@ -55,7 +55,7 @@ static int clear_block_lock_bit(vu_long * addr);
unsigned long flash_init (void)
{
-#ifndef CONFIG_MPC8260ADS
+#ifndef CONFIG_MPC8266ADS
volatile immap_t *immap = (immap_t *)CFG_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
volatile ip860_bcsr_t *bcsr = (ip860_bcsr_t *)BCSR_BASE;
@@ -66,7 +66,7 @@ unsigned long flash_init (void)
/* Init: enable write,
* or we cannot even write flash commands
*/
-#ifndef CONFIG_MPC8260ADS
+#ifndef CONFIG_MPC8266ADS
bcsr->bd_ctrl |= BD_CTRL_FLWE;
#endif
@@ -86,7 +86,7 @@ unsigned long flash_init (void)
size, size<<20);
}
-#ifndef CONFIG_MPC8260ADS
+#ifndef CONFIG_MPC8266ADS
/* Remap FLASH according to real size */
memctl->memc_or1 = CFG_OR_TIMING_FLASH | (-size & 0xFFFF8000);
memctl->memc_br1 = (CFG_FLASH_BASE & BR_BA_MSK) |