Re: [U-Boot] [PATCH 1/6] mtd: cfi_flash: Use CONFIG_SYS_MONITOR_BASE only when defined
Hi Stefan, On 09/10/19 12:46 PM, Stefan Roese wrote: > Hi Vignesh, > > sorry for the late review. > > On 10.09.19 07:10, Vignesh Raghavendra wrote: >> 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 >> --- >> drivers/mtd/cfi_flash.c | 5 - >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c >> index c59254c76e3e..fea15fb523d8 100644 >> --- a/drivers/mtd/cfi_flash.c >> +++ b/drivers/mtd/cfi_flash.c >> @@ -178,7 +178,8 @@ __maybe_weak u64 flash_read64(void *addr) >> >> /*--- >> */ >> #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)) > > Here you extend the exisiting #ifdef ... > >> static flash_info_t *flash_get_info(ulong base) >> { >> int i; >> @@ -2329,12 +2330,14 @@ static void flash_protect_default(void) >> #endif >> /* Monitor protection ON by default */ >> +#ifdef CONFIG_SYS_MONITOR_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, >> flash_get_info(CONFIG_SYS_MONITOR_BASE)); >> +#endif >> #endif > > ... and here you add a 2nd #ifdef. Why don't you extend the existing > one here as well? > Ah, yes, Will fix it in next version. Thanks! > Thanks, > Stefan -- Regards Vignesh ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/6] mtd: cfi_flash: Use CONFIG_SYS_MONITOR_BASE only when defined
Hi Vignesh, sorry for the late review. On 10.09.19 07:10, Vignesh Raghavendra wrote: 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 --- drivers/mtd/cfi_flash.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c59254c76e3e..fea15fb523d8 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -178,7 +178,8 @@ __maybe_weak u64 flash_read64(void *addr) /*--- */ #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)) Here you extend the exisiting #ifdef ... static flash_info_t *flash_get_info(ulong base) { int i; @@ -2329,12 +2330,14 @@ static void flash_protect_default(void) #endif /* Monitor protection ON by default */ +#ifdef CONFIG_SYS_MONITOR_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, flash_get_info(CONFIG_SYS_MONITOR_BASE)); +#endif #endif ... and here you add a 2nd #ifdef. Why don't you extend the existing one here as well? Thanks, Stefan ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/6] 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 --- drivers/mtd/cfi_flash.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c59254c76e3e..fea15fb523d8 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -178,7 +178,8 @@ __maybe_weak u64 flash_read64(void *addr) /*--- */ #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) { int i; @@ -2329,12 +2330,14 @@ static void flash_protect_default(void) #endif /* Monitor protection ON by default */ +#ifdef CONFIG_SYS_MONITOR_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, flash_get_info(CONFIG_SYS_MONITOR_BASE)); +#endif #endif /* Environment protection ON by default */ -- 2.23.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot