diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-09-15 21:43:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-15 21:43:25 +0200 |
| commit | cae26e2fdd9934644086fda9f7cbc336a1fe5ce8 (patch) | |
| tree | 5f9ae145135d5583fadff9564196fbf5f10e34ea /board/eric/flash.c | |
| parent | 6c7bc91fb3dba186d3398a1653f6db236510ffa7 (diff) | |
| parent | 4c1883670acbf1cc83c04df1876235c3aedde128 (diff) | |
| download | u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.zip u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.gz u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board/eric/flash.c')
| -rw-r--r-- | board/eric/flash.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/board/eric/flash.c b/board/eric/flash.c index 7e57513..fded412 100644 --- a/board/eric/flash.c +++ b/board/eric/flash.c @@ -105,24 +105,24 @@ unsigned long flash_init (void) if (size_b1) { - mtdcr(ebccfga, pb0cr); - pbcr = mfdcr(ebccfgd); - mtdcr(ebccfga, pb0cr); + mtdcr(EBC0_CFGADDR, PB0CR); + pbcr = mfdcr(EBC0_CFGDATA); + mtdcr(EBC0_CFGADDR, PB0CR); base_b1 = -size_b1; pbcr = (pbcr & 0x0001ffff) | base_b1 | (((size_b1/1024/1024)-1)<<17); - mtdcr(ebccfgd, pbcr); - /* printf("pb1cr = %x\n", pbcr); */ + mtdcr(EBC0_CFGDATA, pbcr); + /* printf("PB1CR = %x\n", pbcr); */ } if (size_b0) { - mtdcr(ebccfga, pb1cr); - pbcr = mfdcr(ebccfgd); - mtdcr(ebccfga, pb1cr); + mtdcr(EBC0_CFGADDR, PB1CR); + pbcr = mfdcr(EBC0_CFGDATA); + mtdcr(EBC0_CFGADDR, PB1CR); base_b0 = base_b1 - size_b0; pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17); - mtdcr(ebccfgd, pbcr); - /* printf("pb0cr = %x\n", pbcr); */ + mtdcr(EBC0_CFGDATA, pbcr); + /* printf("PB0CR = %x\n", pbcr); */ } size_b0 = flash_get_size((volatile FLASH_WORD_SIZE *)base_b0, &flash_info[0]); |