V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

This commit is contained in:
Wolfgang Denk 2010-03-04 21:30:01 +01:00
parent b003bf79e3 8f9a221045
commit ef8d008730
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/cfi_flash.c
View File

@ -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,