[U-Boot] [PATCH 23/27] kup4k/kup4x: rename load_sernum_ethaddr() to kup_load_sernum_ethaddr()

Wolfgang Denk wd at denx.de
Mon Feb 16 23:58:26 CET 2009


Dear Mike Frysinger,

In message <1234596190-524-24-git-send-email-vapier at gentoo.org> you wrote:
> Rename load_sernum_ethaddr() to kup_load_sernum_ethaddr() and have board
> init code call it rather than the common ppc board code.
> 
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>
> CC: Ben Warren <biggerbadderben at gmail.com>
> ---
>  board/kup/common/load_sernum_ethaddr.c |    6 +++++-
>  board/kup/kup4k/kup4k.c                |    3 +++
>  board/kup/kup4x/kup4x.c                |    4 +++-
>  3 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/board/kup/common/load_sernum_ethaddr.c b/board/kup/common/load_sernum_ethaddr.c
> index 741e9a5..5f725f8 100644
> --- a/board/kup/common/load_sernum_ethaddr.c
> +++ b/board/kup/common/load_sernum_ethaddr.c
> @@ -51,7 +51,7 @@
>  #define ETHADDR_TOKEN "ethaddr="
>  #define LCD_TOKEN "lcd="
>  
> -void load_sernum_ethaddr (void)
> +void kup_load_sernum_ethaddr (void)
>  {
>  	unsigned char *hwi;
>  	char *var;
> @@ -92,3 +92,7 @@ void load_sernum_ethaddr (void)
>  		}
>  	}
>  }
> +
> +void load_sernum_ethaddr (void)
> +{
> +}
> diff --git a/board/kup/kup4k/kup4k.c b/board/kup/kup4k/kup4k.c
> index df3ffb4..f49c85a 100644
> --- a/board/kup/kup4k/kup4k.c
> +++ b/board/kup/kup4k/kup4k.c
> @@ -233,6 +233,8 @@ phys_size_t initdram (int board_type)
>  
>  /* ------------------------------------------------------------------------- */
>  
> +extern void kup_load_sernum_ethaddr(void);
> +
>  int misc_init_r (void)
>  {
>  #ifdef CONFIG_STATUS_LED
> @@ -250,6 +252,7 @@ int misc_init_r (void)
>  	immap->im_ioport.iop_papar &= ~0x80;
>  	immap->im_ioport.iop_padat |= 0x80;	/* turn it off */
>  #endif
> +	kup_load_sernum_ethaddr();
>  	setenv("hw","4k");
>  	poweron_key();
>  	return (0);
> diff --git a/board/kup/kup4x/kup4x.c b/board/kup/kup4x/kup4x.c
> index c5b742d..b5b7595 100644
> --- a/board/kup/kup4x/kup4x.c
> +++ b/board/kup/kup4x/kup4x.c
> @@ -292,10 +292,11 @@ static long int dram_size (long int mamr_value, long int *base,
>  }
>  #endif
>  
> +extern void kup_load_sernum_ethaddr(void);
> +
>  int misc_init_r (void)
>  {
>  	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
> -
>  #ifdef CONFIG_IDE_LED
>  	/* Configure PA8 as output port */
>  	immap->im_ioport.iop_padir |= 0x80;
> @@ -306,6 +307,7 @@ int misc_init_r (void)
>  #ifdef KUP4X_USB
>  	usb_init_kup4x ();
>  #endif
> +	kup_load_sernum_ethaddr();
>  	setenv ("hw", "4x");
>  	poweron_key ();
>  	return (0);

See previous review comments - NAK.

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 is a biblical analogy I'd like to draw here.   Casts are to C++
Programmers what the apple was to Eve.         - Scott Douglas Meyers


More information about the U-Boot mailing list