* Get (mostly) rid of CFG_MONITOR_LEN definition; compute real length

[u-boot] / board / eric / flash.c

diff --git a/board/eric/flash.c b/board/eric/flash.c
index c3f6e15bc54019c815d39f23e316702cc280590c..5dfb620c6cb3ffa56e2e52f5bce6335f33fef65c 100644 (file)
--- a/board/eric/flash.c
+++ b/board/eric/flash.c
@@ -83,13 +83,13 @@ unsigned long flash_init (void)
            /* Monitor protection ON by default */
 #if 0      /* sand: */
            (void)flash_protect(FLAG_PROTECT_SET,
-                               FLASH_BASE0_PRELIM-CFG_MONITOR_LEN+size_b0,
+                               FLASH_BASE0_PRELIM-monitor_flash_len+size_b0,
                                FLASH_BASE0_PRELIM-1+size_b0,
                                &flash_info[0]);
 #else
            (void)flash_protect(FLAG_PROTECT_SET,
                                CFG_MONITOR_BASE,
-                               CFG_MONITOR_BASE+CFG_MONITOR_LEN-1,
+                               CFG_MONITOR_BASE+monitor_flash_len-1,
                                &flash_info[0]);
 #endif
            size_b1 = 0 ;
@@ -132,13 +132,13 @@ unsigned long flash_init (void)
            /* monitor protection ON by default */
 #if 0      /* sand: */
            (void)flash_protect(FLAG_PROTECT_SET,
-                               FLASH_BASE0_PRELIM-CFG_MONITOR_LEN+size_b0,
+                               FLASH_BASE0_PRELIM-monitor_flash_len+size_b0,
                                FLASH_BASE0_PRELIM-1+size_b0,
                                &flash_info[0]);
 #else
            (void)flash_protect(FLAG_PROTECT_SET,
                                CFG_MONITOR_BASE,
-                               CFG_MONITOR_BASE+CFG_MONITOR_LEN-1,
+                               CFG_MONITOR_BASE+monitor_flash_len-1,
                                &flash_info[0]);
 #endif
 
@@ -150,12 +150,12 @@ unsigned long flash_init (void)
 
              /* monitor protection ON by default */
              (void)flash_protect(FLAG_PROTECT_SET,
-                                 base_b1+size_b1-CFG_MONITOR_LEN,
+                                 base_b1+size_b1-monitor_flash_len,
                                  base_b1+size_b1-1,
                                  &flash_info[1]);
              /* monitor protection OFF by default (one is enough) */
              (void)flash_protect(FLAG_PROTECT_CLEAR,
-                                 base_b0+size_b0-CFG_MONITOR_LEN,
+                                 base_b0+size_b0-monitor_flash_len,
                                  base_b0+size_b0-1,
                                  &flash_info[0]);
            } else {