From: Wolfgang Wegner Date: Tue, 2 Mar 2010 09:59:19 +0000 (+0100) Subject: ] fix monitor protection for CONFIG_MONITOR_IS_IN_RAM X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=8f9a221045a4ace14fe006e1353c593619d1001a;p=u-boot.git ] fix monitor protection for CONFIG_MONITOR_IS_IN_RAM For platforms with flash below ram addresses, the current check to activate monitor protection is wrong/insufficient. This patch fixes CONFIG_MONITOR_IS_IN_RAM for these systems by adding a check for this configuration. Signed-off-by: Wolfgang Wegner Signed-off-by: Stefan Roese --- diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 24eb33f0f6..fdba297c88 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,