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

[karo-tx-uboot.git] / board / Marvell / common / intel_flash.c

diff --git a/board/Marvell/common/intel_flash.c b/board/Marvell/common/intel_flash.c
index d26f883ad33f36be918e0023123c78348f5dc0e5..42b3ee15486377bf533fdc7a9593bdf64fe35568 100755 (executable)
--- a/board/Marvell/common/intel_flash.c
+++ b/board/Marvell/common/intel_flash.c
@@ -152,7 +152,7 @@ int write_word_intel (bank_addr_t addr, bank_word_t value)
        /* data polling for D7 */
        start = get_timer (0);
        do {
-               if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        retval = 1;
                        goto done;
                }
@@ -227,7 +227,7 @@ int flash_erase_intel (flash_info_t * info, int s_first, int s_last)
                        do {
                                now = get_timer (start);
 
-                               if (now - estart > CFG_FLASH_ERASE_TOUT) {
+                               if (now - estart > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                        printf ("Timeout (sect %d)\n", sect);
                                        haderr = 1;
                                        break;