Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / board / dave / PPChameleonEVB / flash.c

diff --git a/board/dave/PPChameleonEVB/flash.c b/board/dave/PPChameleonEVB/flash.c
index 692d275a59eca43dfd36e9ec2fa0a124ae6c176e..237c807b4ffde5d30ddde043e8e27050c2f5f337 100644 (file)
--- a/board/dave/PPChameleonEVB/flash.c
+++ b/board/dave/PPChameleonEVB/flash.c
@@ -42,7 +42,7 @@ static void flash_get_offsets (ulong base, flash_info_t * info);
 unsigned long flash_init (void)
 {
 #ifdef __DEBUG_START_FROM_SRAM__
-       return CFG_DUMMY_FLASH_SIZE;
+       return CONFIG_SYS_DUMMY_FLASH_SIZE;
 #else
        unsigned long size;
        int i;
@@ -54,7 +54,7 @@ unsigned long flash_init (void)
        debug("[%s, %d] flash_info = 0x%08X ...\n", __FUNCTION__, __LINE__, flash_info);
 
        /* Init: no FLASHes known */
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
+       for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
                flash_info[i].flash_id = FLASH_UNKNOWN;
        }
 
@@ -75,9 +75,9 @@ unsigned long flash_init (void)
        debug("[%s, %d] Test point ...\n", __FUNCTION__, __LINE__);
 
        /* Re-do sizing to get full correct info */
-       mtdcr(ebccfga, pb0cr);
-       pbcr = mfdcr(ebccfgd);
-       mtdcr(ebccfga, pb0cr);
+       mtdcr(EBC0_CFGADDR, PB0CR);
+       pbcr = mfdcr(EBC0_CFGDATA);
+       mtdcr(EBC0_CFGADDR, PB0CR);
        base = -size;
        switch (size) {
        case 1 << 20:
@@ -97,12 +97,12 @@ unsigned long flash_init (void)
                break;
        }
        pbcr = (pbcr & 0x0001ffff) | base | (size_val << 17);
-       mtdcr(ebccfgd, pbcr);
+       mtdcr(EBC0_CFGDATA, pbcr);
        debug("[%s, %d] Test point ...\n", __FUNCTION__, __LINE__);
 
        /* Monitor protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
-                           -CFG_MONITOR_LEN,
+                           -CONFIG_SYS_MONITOR_LEN,
                            0xffffffff,
                            &flash_info[0]);