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).
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 ". -#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*); Thanks! Regards, TsiChung -----Original Message----- From: Ben Warren [mailto:[EMAIL PROTECTED] Sent: Thursday, July 03, 2008 2:07 AM To: Liew Tsi Chung; [email protected] Cc: Ben Warren Subject: [PATCH 0/2] Coldfire Ethernet initialization changes These two patches move the default initialization of Coldfire FEC controllers to cpu_eth_init() in the CPU directories. I don't have a Coldfire cross compiler set up nor do I have any hardware, so I'm looking for volunteers to do the following: 1. Run 'MAKEALL coldfire' to check for compile-time errors 2. Try the code out on real hardware 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 thanks! Ben ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ U-Boot-Users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/u-boot-users
