[U-Boot] [PATCH v3] Remove static type from gunzip_bmp()

[U-Boot] [PATCH v3] Remove static type from gunzip_bmp()

[Mark Jackson]

The current bmp routines support gzipped files, but compilation fails (under
AVR32) due to the gunzip_bmp() function being defined as static.

This patch fixes this problem.

The gunzip_bmp routine has also now been defined in the lcd.h header file.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
---

  common/cmd_bmp.c |    4 ++--
  common/lcd.c     |    4 ----
  include/lcd.h    |    4 ++++
  3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index bc08b26..084ef98 100644
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -46,7 +46,7 @@ int gunzip(void *, int, unsigned char *, unsigned long *);
   * didn't contain a valid BMP signature.
   */
  #ifdef CONFIG_VIDEO_BMP_GZIP
-static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
+bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
  {
  	void *dst;
  	unsigned long len;
@@ -85,7 +85,7 @@ static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned 
long *lenp)
  	return bmp;
  }
  #else
-static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
+bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
  {
  	return NULL;
  }
diff --git a/common/lcd.c b/common/lcd.c
index 8cbb540..23196d6 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -789,10 +789,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
  }
  #endif

-#ifdef CONFIG_VIDEO_BMP_GZIP
-extern bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp);
-#endif
-
  static void *lcd_logo (void)
  {
  #ifdef CONFIG_SPLASH_SCREEN
diff --git a/include/lcd.h b/include/lcd.h
index 3184803..41ee6bc 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -208,6 +208,10 @@ void lcd_show_board_info(void);
  # include <asm/byteorder.h>
  #endif

+#ifdef CONFIG_VIDEO_BMP_GZIP
+extern bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp);
+#endif
+
  /*
   *  Information about displays we are using. This is for configuring
   *  the LCD controller and memory allocation. Someone has to know what

[U-Boot] [PATCH v3] Remove static type from gunzip_bmp()

[Wolfgang Denk]

Dear Mark Jackson,

In message <497F052E.20707@mimc.co.uk> you wrote:
> The current bmp routines support gzipped files, but compilation fails (under
> AVR32) due to the gunzip_bmp() function being defined as static.
> 
> This patch fixes this problem.
> 
> The gunzip_bmp routine has also now been defined in the lcd.h header file.
> 
> Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
> ---
> 
>   common/cmd_bmp.c |    4 ++--
>   common/lcd.c     |    4 ----
>   include/lcd.h    |    4 ++++
>   3 files changed, 6 insertions(+), 6 deletions(-)

Sorry, this patch does not apply - not even after fixing the line
wrpping done by your mailer.

Please fix your mailer setup, rebase the patch and resubmit.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There are certain things men must do to remain men.
	-- Kirk, "The Ultimate Computer", stardate 4929.4