Commit 3b57fe0a authored by wdenk's avatar wdenk
Browse files

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

  instead CFG_MONITOR_LEN is now only used to determine  _at_compile_
  _time_  (!) if the environment is embedded within the U-Boot image,
  or in a separate flash sector.

* Cleanup CFG_DER #defines in config files (wd maintained only)
parent f07771cc
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
Changes since U-Boot 0.3.1: Changes since U-Boot 0.3.1:
====================================================================== ======================================================================
* Get (mostly) rid of CFG_MONITOR_LEN definition; compute real length
instead CFG_MONITOR_LEN is now only used to determine _at_compile_
_time_ (!) if the environment is embedded within the U-Boot image,
or in a separate flash sector.
* Cleanup CFG_DER #defines in config files (wd maintained only)
* Fix data abort exception handling for arm920t CPU * Fix data abort exception handling for arm920t CPU
* Fix alignment problems with flash driver for TRAB board * Fix alignment problems with flash driver for TRAB board
......
...@@ -1183,13 +1183,13 @@ The following options need to be configured: ...@@ -1183,13 +1183,13 @@ The following options need to be configured:
Note: Note:
In the current implementation, the local variables In the current implementation, the local variables
space and global environment variables space are space and global environment variables space are
separated. Local variables are those you define by separated. Local variables are those you define by
simply typing like `name=value'. To access a local simply typing `name=value'. To access a local
variable later on, you have write `$name' or variable later on, you have write `$name' or
`${name}'; variable directly by typing say `$name' at `${name}'; to execute the contents of a variable
the command prompt. directly type `$name' at the command prompt.
Global environment variables are those you use Global environment variables are those you use
setenv/printenv to work with. To run a command stored setenv/printenv to work with. To run a command stored
...@@ -1389,7 +1389,10 @@ Configuration Settings: ...@@ -1389,7 +1389,10 @@ Configuration Settings:
CFG_FLASH_BASE when booting from flash. CFG_FLASH_BASE when booting from flash.
- CFG_MONITOR_LEN: - CFG_MONITOR_LEN:
Size of memory reserved for monitor code Size of memory reserved for monitor code, used to
determine _at_compile_time_ (!) if the environment is
embedded within the U-Boot image, or in a separate
flash sector.
- CFG_MALLOC_LEN: - CFG_MALLOC_LEN:
Size of DRAM reserved for malloc() use. Size of DRAM reserved for malloc() use.
......
...@@ -118,7 +118,7 @@ flash_init (void) ...@@ -118,7 +118,7 @@ flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN-1, CFG_MONITOR_BASE + monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -120,7 +120,7 @@ unsigned long flash_init (void) ...@@ -120,7 +120,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -64,7 +64,7 @@ unsigned long flash_init (void) ...@@ -64,7 +64,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -85,7 +85,7 @@ unsigned long flash_init (void) ...@@ -85,7 +85,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -73,7 +73,7 @@ unsigned long flash_init (void) ...@@ -73,7 +73,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -91,7 +91,7 @@ unsigned long flash_init (void) ...@@ -91,7 +91,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
flash_get_info(CFG_MONITOR_BASE)); flash_get_info(CFG_MONITOR_BASE));
#endif #endif
......
...@@ -219,7 +219,7 @@ flash_init(void) ...@@ -219,7 +219,7 @@ flash_init(void)
#if CFG_MONITOR_BASE >= CFG_FLASH_BASE #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -91,7 +91,7 @@ unsigned long flash_init (void) ...@@ -91,7 +91,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
...@@ -118,7 +118,7 @@ unsigned long flash_init (void) ...@@ -118,7 +118,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[1]); &flash_info[1]);
#endif #endif
......
...@@ -106,7 +106,7 @@ unsigned long flash_init (void) ...@@ -106,7 +106,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -323,7 +323,7 @@ flash_init(void) ...@@ -323,7 +323,7 @@ flash_init(void)
#if CFG_MONITOR_BASE == CFG_FLASH_BASE #if CFG_MONITOR_BASE == CFG_FLASH_BASE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -132,12 +132,12 @@ unsigned long flash_init(void) ...@@ -132,12 +132,12 @@ unsigned long flash_init(void)
#if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[1]); &flash_info[1]);
#else #else
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif #endif
......
...@@ -218,14 +218,14 @@ unsigned long flash_init (void) ...@@ -218,14 +218,14 @@ unsigned long flash_init (void)
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[1] CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[1]
); );
} }
#else #else
#if CFG_MONITOR_BASE >= CFG_FLASH_BASE #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0] CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]
); );
#endif #endif
#endif #endif
......
...@@ -73,7 +73,7 @@ ulong flash_init(void) ...@@ -73,7 +73,7 @@ ulong flash_init(void)
*/ */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE + _armboot_end_data - _armboot_start, CFG_FLASH_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
......
...@@ -88,7 +88,7 @@ unsigned long flash_init (void) ...@@ -88,7 +88,7 @@ unsigned long flash_init (void)
/* Monitor protection ON by default */ /* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
FLASH_BASE0_PRELIM, FLASH_BASE0_PRELIM,
FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, FLASH_BASE0_PRELIM+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
size_b1 = 0 ; size_b1 = 0 ;
......
...@@ -74,7 +74,7 @@ ulong flash_init(void) ...@@ -74,7 +74,7 @@ ulong flash_init(void)
/* Protect monitor and environment sectors */ /* Protect monitor and environment sectors */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE + _armboot_end_data - _armboot_start, CFG_FLASH_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
......
...@@ -125,12 +125,12 @@ unsigned long flash_init(void) ...@@ -125,12 +125,12 @@ unsigned long flash_init(void)
#if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[1]); &flash_info[1]);
#else #else
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif #endif
......
...@@ -84,7 +84,7 @@ unsigned long flash_init (void) ...@@ -84,7 +84,7 @@ unsigned long flash_init (void)
*/ */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE + _armboot_end_data - _armboot_start, CFG_FLASH_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
......
...@@ -83,21 +83,21 @@ unsigned long flash_init (void) ...@@ -83,21 +83,21 @@ unsigned long flash_init (void)
{ {
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
FLASH_BASE0_PRELIM, FLASH_BASE0_PRELIM,
FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, FLASH_BASE0_PRELIM+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
} }
if (size2 == 512*1024) if (size2 == 512*1024)
{ {
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
FLASH_BASE1_PRELIM, FLASH_BASE1_PRELIM,
FLASH_BASE1_PRELIM+CFG_MONITOR_LEN-1, FLASH_BASE1_PRELIM+monitor_flash_len-1,
&flash_info[1]); &flash_info[1]);
} }
if (size2 == 4*1024*1024) if (size2 == 4*1024*1024)
{ {
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE+CFG_MONITOR_LEN-1, CFG_FLASH_BASE+monitor_flash_len-1,
&flash_info[1]); &flash_info[1]);
} }
......
...@@ -83,21 +83,21 @@ unsigned long flash_init (void) ...@@ -83,21 +83,21 @@ unsigned long flash_init (void)
{ {
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
FLASH_BASE0_PRELIM, FLASH_BASE0_PRELIM,
FLASH_BASE0_PRELIM+CFG_MONITOR_LEN-1, FLASH_BASE0_PRELIM+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
} }
if (size2 == 512*1024) if (size2 == 512*1024)
{ {
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
FLASH_BASE1_PRELIM, FLASH_BASE1_PRELIM,
FLASH_BASE1_PRELIM+CFG_MONITOR_LEN-1, FLASH_BASE1_PRELIM+monitor_flash_len-1,
&flash_info[1]); &flash_info[1]);
} }
if (size2 == 4*1024*1024) if (size2 == 4*1024*1024)
{ {
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE+CFG_MONITOR_LEN-1, CFG_FLASH_BASE+monitor_flash_len-1,
&flash_info[1]); &flash_info[1]);
} }
......
...@@ -92,7 +92,7 @@ unsigned long flash_init (void) ...@@ -92,7 +92,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE+CFG_MONITOR_LEN-1, CFG_FLASH_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
flash_info[0].size = size_b0; flash_info[0].size = size_b0;
......
...@@ -61,7 +61,7 @@ ulong flash_init (void) ...@@ -61,7 +61,7 @@ ulong flash_init (void)
*/ */
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_FLASH_BASE, CFG_FLASH_BASE,
CFG_FLASH_BASE + _armboot_end_data - _armboot_start, CFG_FLASH_BASE + monitor_flash_len - 1,
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
......
...@@ -140,7 +140,7 @@ unsigned long flash_init (void) ...@@ -140,7 +140,7 @@ unsigned long flash_init (void)
#if CFG_MONITOR_BASE >= CFG_FLASH0_BASE #if CFG_MONITOR_BASE >= CFG_FLASH0_BASE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
......
...@@ -83,13 +83,13 @@ unsigned long flash_init (void) ...@@ -83,13 +83,13 @@ unsigned long flash_init (void)
/* Monitor protection ON by default */ /* Monitor protection ON by default */
#if 0 /* sand: */ #if 0 /* sand: */
(void)flash_protect(FLAG_PROTECT_SET, (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_BASE0_PRELIM-1+size_b0,
&flash_info[0]); &flash_info[0]);
#else #else
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
size_b1 = 0 ; size_b1 = 0 ;
...@@ -132,13 +132,13 @@ unsigned long flash_init (void) ...@@ -132,13 +132,13 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
#if 0 /* sand: */ #if 0 /* sand: */
(void)flash_protect(FLAG_PROTECT_SET, (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_BASE0_PRELIM-1+size_b0,
&flash_info[0]); &flash_info[0]);
#else #else
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE+CFG_MONITOR_LEN-1, CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
...@@ -150,12 +150,12 @@ unsigned long flash_init (void) ...@@ -150,12 +150,12 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (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, base_b1+size_b1-1,
&flash_info[1]); &flash_info[1]);
/* monitor protection OFF by default (one is enough) */ /* monitor protection OFF by default (one is enough) */
(void)flash_protect(FLAG_PROTECT_CLEAR, (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, base_b0+size_b0-1,
&flash_info[0]); &flash_info[0]);
} else { } else {
......
...@@ -80,7 +80,7 @@ unsigned long flash_init (void) ...@@ -80,7 +80,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
FLASH_BASE0_PRELIM+size_b0-CFG_MONITOR_LEN, FLASH_BASE0_PRELIM+size_b0-monitor_flash_len,
FLASH_BASE0_PRELIM+size_b0-1, FLASH_BASE0_PRELIM+size_b0-1,
&flash_info[0]); &flash_info[0]);
...@@ -93,12 +93,12 @@ unsigned long flash_init (void) ...@@ -93,12 +93,12 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
FLASH_BASE0_PRELIM+size_b0+size_b1-CFG_MONITOR_LEN, FLASH_BASE0_PRELIM+size_b0+size_b1-monitor_flash_len,
FLASH_BASE0_PRELIM+size_b0+size_b1-1, FLASH_BASE0_PRELIM+size_b0+size_b1-1,
&flash_info[1]); &flash_info[1]);
/* monitor protection OFF by default (one is enough) */ /* monitor protection OFF by default (one is enough) */
flash_protect(FLAG_PROTECT_CLEAR, flash_protect(FLAG_PROTECT_CLEAR,
FLASH_BASE0_PRELIM+size_b0-CFG_MONITOR_LEN, FLASH_BASE0_PRELIM+size_b0-monitor_flash_len,
FLASH_BASE0_PRELIM+size_b0-1, FLASH_BASE0_PRELIM+size_b0-1,
&flash_info[0]); &flash_info[0]);
} else { } else {
......
...@@ -94,7 +94,7 @@ unsigned long flash_init (void) ...@@ -94,7 +94,7 @@ unsigned long flash_init (void)
/* monitor protection ON by default */ /* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
base_b0+size_b0-CFG_MONITOR_LEN, base_b0+size_b0-monitor_flash_len,
base_b0+size_b0-1, base_b0+size_b0-1,
&flash_info[0]); &flash_info[0]);
...@@ -106,12 +106,12 @@ unsigned long flash_init (void) ...@@ -106,12 +106,12 @@ unsigned long flash_init (void)