imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / board / ssv / adnpesc1 / flash.c

diff --git a/board/ssv/adnpesc1/flash.c b/board/ssv/adnpesc1/flash.c
index fd8379b1b825b3c106e9fab24d2d7b205a60a5a0..882630c582cb87ea3a9dc9f2aaeeab74008d7457 100755 (executable)
--- a/board/ssv/adnpesc1/flash.c
+++ b/board/ssv/adnpesc1/flash.c
@@ -36,7 +36,7 @@
 /*---------------------------------------------------------------------*/
 #define        BANKSZ  (8 * 1024 * 1024)
 #define        SECTSZ  (64 * 1024)
-#define        UBOOTSECS ((CFG_MONITOR_LEN + CFG_ENV_SIZE) / SECTSZ)
+#define        UBOOTSECS ((CONFIG_SYS_MONITOR_LEN + CONFIG_ENV_SIZE) / SECTSZ)
 #define        UBOOTAREA (UBOOTSECS * 64 * 1024)       /* monitor / env area */
 
 /*---------------------------------------------------------------------*/
@@ -47,16 +47,16 @@ unsigned long flash_init (void)
        flash_info_t *fli = &flash_info[0];
 
        fli->size = BANKSZ;
-       fli->sector_count = CFG_MAX_FLASH_SECT;
+       fli->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
        fli->flash_id = FLASH_MAN_AMD + FLASH_AMLV640U;
 
-       addr = CFG_FLASH_BASE;
+       addr = CONFIG_SYS_FLASH_BASE;
        for (i = 0; i < fli->sector_count; ++i) {
                fli->start[i] = addr;
                addr += SECTSZ;
 
                /* Protect monitor / environment area */
-               if (addr <= (CFG_FLASH_BASE + UBOOTAREA))
+               if (addr <= (CONFIG_SYS_FLASH_BASE + UBOOTAREA))
                        fli->protect[i] = 1;
                else
                        fli->protect[i] = 0;