From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Warren <biggerbadderben@gmail.com>
Date: Tue, 08 Jul 2008 11:42:47 -0700
Subject: [U-Boot-Users] [PATCH 0/2] Coldfire Ethernet initialization
	changes
In-Reply-To: <4791E710007FEB4BBF83775D787F462F074599B8@az33exm22.fsl.freescale.net>
References: <> <1215068843-5373-1-git-send-email-biggerbadderben@gmail.com>
	<4791E710007FEB4BBF83775D787F462F074599B8@az33exm22.fsl.freescale.net>
Message-ID: <4873B527.3080707@gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Liew Tsi Chung wrote:
> Ben,
>
>   
>> I'm pushing these patches to a 'testing' branch on the net repo.
>>     
> Please clone it as follows:
>   
>> $ git clone git://git.denx.de/u-boot-net.git $ cd u-boot-net $ git
>>     
> checkout testing
> There is no testing branch in u-boot-net, so I applied the two patches
> you sent on top of current u-boot-net tree (commit
> 63676841ca2d603b13765f3f7b72ff1a61c23f90 - Jun 18. Remove duplicate code
> in cpu/arm926ejs/davinci/lxt972.c).
>
>   
There is a testing branch in the repo:
http://git.denx.de/?p=u-boot/u-boot-net.git;a=shortlog;h=refs/heads/testing

I just don't know how to use git properly...
> Only one conflict and error:
> The first patch - CONFIG_FSLDMAFEC for 547x_8x and is correct.
> Then, the second patch - CONFIG_MCFFEC, appended #if after ||, either
> remove CONFIG_MCFFEC for 547x_8x or remove "#if ".
>
>   
Oh yeah, duh!  I need to free up some space on my hard drive so I can 
have more tools...
> -#if defined(CONFIG_FSLDMAFEC)
> +#if defined(CONFIG_FSLDMAFEC) || #if defined(CONFIG_MCFFEC)
> +/* Default initializations for MCFFEC controllers.  To override,
> + * create a board-specific function called:
> + * 	int board_eth_init(bd_t *bis)
> + */
> +
>  extern int mcdmafec_initialize(bd_t *bis);
> +extern int mcffec_initialize(bd_t*);
>   
Does it work after you fix this up?

thanks a lot!
Ben