mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 15:40:29 +09:00
mtd: cfi_flash: Use CONFIG_SYS_MONITOR_BASE only when defined
Make use of CONFIG_SYS_MONITOR_BASE only when available to avoid build error when CONFIG_SYS_MONITOR_BASE is not defined. Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
44510daea4
commit
d75eacf9b8
@ -178,7 +178,8 @@ __maybe_weak u64 flash_read64(void *addr)
|
|||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || \
|
#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || \
|
||||||
(CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
|
(defined(CONFIG_SYS_MONITOR_BASE) && \
|
||||||
|
(CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE))
|
||||||
static flash_info_t *flash_get_info(ulong base)
|
static flash_info_t *flash_get_info(ulong base)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -2329,7 +2330,8 @@ static void flash_protect_default(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Monitor protection ON by default */
|
/* Monitor protection ON by default */
|
||||||
#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \
|
#if defined(CONFIG_SYS_MONITOR_BASE) && \
|
||||||
|
(CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \
|
||||||
(!defined(CONFIG_MONITOR_IS_IN_RAM))
|
(!defined(CONFIG_MONITOR_IS_IN_RAM))
|
||||||
flash_protect(FLAG_PROTECT_SET,
|
flash_protect(FLAG_PROTECT_SET,
|
||||||
CONFIG_SYS_MONITOR_BASE,
|
CONFIG_SYS_MONITOR_BASE,
|
||||||
|
Loading…
Reference in New Issue
Block a user