Patchwork [U-Boot] cfi_flash: Fix CONFIG_SYS_FLASH_AUTOPROTECT_LIST usage

login
register
mail settings
Submitter Peter Tyser
Date April 13, 2011, 4:46 p.m.
Message ID <1302713216-23363-1-git-send-email-ptyser@xes-inc.com>
Download mbox | patch
Permalink /patch/91071/
State Accepted
Commit 2c51983b810d73946f653a4385c65a8b7babbbe1
Headers show

Comments

Peter Tyser - April 13, 2011, 4:46 p.m.
Commit 6ee1416e8184b4d9ebe6087d396a60bcecf3551c (mtd, cfi: introduce
void flash_protect_default(void)) introduced a bug which resulted in
boards that define CONFIG_SYS_FLASH_AUTOPROTECT_LIST not compiling with
the the following errors and warning:
  ptyser@petert u-boot $ make -s xpedite520x
  Configuring for xpedite520x board...
  cfi_flash.c: In function 'flash_protect_default':
  cfi_flash.c:2118: error: 'i' undeclared (first use in this function)
  cfi_flash.c:2118: error: (Each undeclared identifier is reported only once
  cfi_flash.c:2118: error: for each function it appears in.)
  cfi_flash.c:2118: error: 'apl' undeclared (first use in this function)
  cfi_flash.c:2118: error: invalid application of 'sizeof' to incomplete type 'struct apl_s'
  cfi_flash.c: In function 'flash_init':
  cfi_flash.c:2137: warning: unused variable 'apl'

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reported-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Heiko Schocher <hs@denx.de>
---
Thanks for noticing this Kumar.

 drivers/mtd/cfi_flash.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
Wolfgang Denk - April 13, 2011, 7:50 p.m.
Dear Peter Tyser,

In message <1302713216-23363-1-git-send-email-ptyser@xes-inc.com> you wrote:
> Commit 6ee1416e8184b4d9ebe6087d396a60bcecf3551c (mtd, cfi: introduce
> void flash_protect_default(void)) introduced a bug which resulted in
> boards that define CONFIG_SYS_FLASH_AUTOPROTECT_LIST not compiling with
> the the following errors and warning:
>   ptyser@petert u-boot $ make -s xpedite520x
>   Configuring for xpedite520x board...
>   cfi_flash.c: In function 'flash_protect_default':
>   cfi_flash.c:2118: error: 'i' undeclared (first use in this function)
>   cfi_flash.c:2118: error: (Each undeclared identifier is reported only once
>   cfi_flash.c:2118: error: for each function it appears in.)
>   cfi_flash.c:2118: error: 'apl' undeclared (first use in this function)
>   cfi_flash.c:2118: error: invalid application of 'sizeof' to incomplete type 'struct apl_s'
>   cfi_flash.c: In function 'flash_init':
>   cfi_flash.c:2137: warning: unused variable 'apl'
> 
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> Reported-by: Kumar Gala <galak@kernel.crashing.org>
> Cc: Heiko Schocher <hs@denx.de>
> ---
> Thanks for noticing this Kumar.
> 
>  drivers/mtd/cfi_flash.c |   14 ++++++++------
>  1 files changed, 8 insertions(+), 6 deletions(-)

Appled, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 5788328..91ddcb4 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -2089,6 +2089,14 @@  static void cfi_flash_set_config_reg(u32 base, u16 val)
 
 void flash_protect_default(void)
 {
+#if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
+	int i;
+	struct apl_s {
+		ulong start;
+		ulong size;
+	} apl[] = CONFIG_SYS_FLASH_AUTOPROTECT_LIST;
+#endif
+
 	/* Monitor protection ON by default */
 #if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \
 	(!defined(CONFIG_MONITOR_IS_IN_RAM))
@@ -2130,12 +2138,6 @@  unsigned long flash_init (void)
 {
 	unsigned long size = 0;
 	int i;
-#if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
-	struct apl_s {
-		ulong start;
-		ulong size;
-	} apl[] = CONFIG_SYS_FLASH_AUTOPROTECT_LIST;
-#endif
 
 #ifdef CONFIG_SYS_FLASH_PROTECTION
 	/* read environment from EEPROM */