Skip to content
Snippets Groups Projects
Commit ef8d0087 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

parents b003bf79 8f9a2210
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
drivers/mtd/cfi_flash.c
+ 2
− 1
View file @ ef8d0087
...@@ -1980,7 +1980,8 @@ unsigned long flash_init (void) ...@@ -1980,7 +1980,8 @@ unsigned long flash_init (void)
} }
/* Monitor protection ON by default */ /* 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, flash_protect (FLAG_PROTECT_SET,
CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE,
CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment