imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / prodrive / pdnb3 / flash.c

diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c
index d0e5fe703b98fd386fed671abc7d5d780dfb156c..fe8d100083c6503b7d88083644e71ba917c49ca0 100755 (executable)
--- a/board/prodrive/pdnb3/flash.c
+++ b/board/prodrive/pdnb3/flash.c
@@ -24,6 +24,8 @@
 #include <common.h>
 #include <asm/arch/ixp425.h>
 
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
+
 /*
  * include common flash code (for esd boards)
  */
@@ -50,7 +52,7 @@ unsigned long flash_init(void)
        int i;
 
        /* 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;
 
        size = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
@@ -64,22 +66,24 @@ unsigned long flash_init(void)
 
        /* Monitor protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_MONITOR_BASE, CFG_MONITOR_BASE + monitor_flash_len - 1,
-                     &flash_info[CFG_MAX_FLASH_BANKS - 1]);
+                     CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
+                     &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 
        /* Environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
-                     &flash_info[CFG_MAX_FLASH_BANKS - 1]);
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
+                     &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 
        /* Redundant environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
-                     &flash_info[CFG_MAX_FLASH_BANKS - 1]);
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
+                     &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 
        flash_info[0].size = size;
 
        return size;
 }
+
+#endif /* CONFIG_FLASH_CFI_DRIVER */