summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-04 21:30:01 +0100
committerWolfgang Denk <wd@denx.de>2010-03-04 21:30:01 +0100
commitef8d008730fb62fc81a792274eea40480593a7d3 (patch)
tree01d9084ad82c55b187b09f0823df757bcade2a96
parentb003bf79e3f6b278f746bc094f4a78f6f96800f2 (diff)
parent8f9a221045a4ace14fe006e1353c593619d1001a (diff)
downloadu-boot-imx-ef8d008730fb62fc81a792274eea40480593a7d3.zip
u-boot-imx-ef8d008730fb62fc81a792274eea40480593a7d3.tar.gz
u-boot-imx-ef8d008730fb62fc81a792274eea40480593a7d3.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
-rw-r--r--drivers/mtd/cfi_flash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 24eb33f..fdba297 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1980,7 +1980,8 @@ unsigned long flash_init (void)
}
/* Monitor protection ON by default */
-#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
+#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \
+ (!defined(CONFIG_MONITOR_IS_IN_RAM))
flash_protect (FLAG_PROTECT_SET,
CONFIG_SYS_MONITOR_BASE,
CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,