[U-Boot-Users] [DNX#2006081742000061] [PATCH 2/6] Consolidate mpc83xx files for mpc8360e [...]

[DENX Support System]

Hello list,

inside the automatic U-Boot patch tracking system a new ticket
[DNX#2006081742000061] was created:

<snip>
> Subject: [PATCH] Consolidate mpc83xx files for mpc8360e
> 
> ---
> 
>  cpu/mpc83xx/cpu.c            |   39 +-
>  cpu/mpc83xx/cpu_init.c       |   26 +
>  cpu/mpc83xx/i2c.c            |   10 
>  cpu/mpc83xx/spd_sdram.c      |  333 ++++++++-----
>  cpu/mpc83xx/speed.c          |  226 +++++----
>  cpu/mpc83xx/start.S          |   39 +-
>  include/asm-ppc/immap_83xx.h | 1068
> ++++++++++++++++++++++++++++++++++++++----
>  include/mpc83xx.h            |  125 ++++-
>  8 files changed, 1498 insertions(+), 368 deletions(-)
> 
> 92fc26524660e25857a162656e5e6b0508201253
> diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
> index 20bba6c..16c4ee4 100644
> --- a/cpu/mpc83xx/cpu.c
> +++ b/cpu/mpc83xx/cpu.c
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2004 Freescale Semiconductor, Inc.
> + * Copyright (C) 2004-2006 Freescale Semiconductor, Inc.
>   *
>   * See file CREDITS for list of people who contributed to this
>   * project.
> @@ -23,6 +23,8 @@
>   *
>   * 20050101: Eran Liberty (liberty at freescale.com)
>   *	     Initial file creating (porting from 85XX & 8260)
> + * 20060520: Dave Liu (Daveliu at freescale.com)
> + * 	     Add support for mpc8360e
>   */
>  
>  /*
> @@ -43,28 +45,43 @@ DECLARE_GLOBAL_DATA_PTR;
>  
>  int checkcpu(void)
>  {
> +	volatile immap_t *immr;
> +	u32 spridr;
>  	ulong clock = gd->cpu_clk;
>  	u32 pvr = get_pvr();
>  	char buf[32];
>  
> +	immr = (immap_t *)CFG_IMMRBAR;
> +
>  	if ((pvr & 0xFFFF0000) != PVR_83xx) {
>  		puts("Not MPC83xx Family!!!\n");
>  		return -1;
>  	}
>  
> -	puts("CPU:   MPC83xx, ");
> -	switch(pvr) {
> -	case PVR_8349_REV10:
> +	spridr = immr->sysconf.spridr;
> +	puts("CPU: ");
> +	switch(spridr) {
> +	case SPR_8349E_REV10:
> +	case SPR_8349E_REV11:
> +		puts("MPC8349E, ");
>  		break;
> -	case PVR_8349_REV11:
> +	case SPR_8360E_REV10:
> +	case SPR_8360E_REV11:
> +	case SPR_8360E_REV12:
> +		puts("MPC8360E, ");
>  		break;
>  	default:
>  		puts("Rev: Unknown\n");
>  		return -1;	/* Not sure what this is */
>  	}
> -	printf("Rev: %d.%d at %s MHz\n", (pvr & 0xf0) >> 4,
> -		(pvr & 0x0f), strmhz(buf, clock));
> -
> +#if defined(CONFIG_MPC8349)
> +	printf("Rev: %02x at %s MHz\n",
> +		(spridr & 0x0000FFFF)>>4 |(spridr & 0x0000000F),
> +		 strmhz(buf, clock));
> +#elif defined(CONFIG_MPC8360)
> +	printf("Rev: %02x at %s MHz\n",
> +		spridr & 0x0000FFFF, strmhz(buf, clock));
> +#endif
>  	return 0;
>  }
>  
> @@ -195,7 +212,7 @@ #if defined(CONFIG_DDR_ECC)
>  void dma_init(void)
>  {
>  	volatile immap_t *immap = (immap_t *)CFG_IMMRBAR;
> -	volatile dma8349_t *dma = &immap->dma;
> +	volatile dma83xx_t *dma = &immap->dma;
>  	volatile u32 status = swab32(dma->dmasr0);
>  	volatile u32 dmamr0 = swab32(dma->dmamr0);
>  
> @@ -226,7 +243,7 @@ void dma_init(void)
>  uint dma_check(void)
>  {
>  	volatile immap_t *immap = (immap_t *)CFG_IMMRBAR;
</snip>

Your U-Boot support team