From: roy zang <tie-fei.zang@freescale.com>
Date: Fri, 1 Dec 2006 04:09:33 +0000 (+0800)
Subject: Fix the confilcts when merging 'master' into hpc2.
X-Git-Tag: v1.3.0-rc1~109^2~3^2~6^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e0b369e4f71b11dd5716903dd6258028cf07e6e8;p=oweals%2Fu-boot.git

Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.

Merge branch 'master' into hpc2

Conflicts:

	MAKEALL
	cpu/74xx_7xx/cpu.c
	cpu/74xx_7xx/cpu_init.c
	cpu/74xx_7xx/speed.c
---

e0b369e4f71b11dd5716903dd6258028cf07e6e8
diff --cc MAKEALL
index 5aad6e7594,74bf383aa7..fd78585b9e
--- a/MAKEALL
+++ b/MAKEALL
@@@ -150,8 -150,8 +150,9 @@@ LIST_85xx="	
  #########################################################################
  
  LIST_74xx="	\
- 	DB64360		DB64460		EVB64260	mpc7448hpc2	\
- 	P3G4    	PCIPPC2		PCIPPC6		ZUMA		\
+ 	DB64360		DB64460		EVB64260	P3G4		\
+ 	p3m7448		PCIPPC2		PCIPPC6		ZUMA		\
++	mpc7448hpc2
  "
  
  LIST_7xx="	\
diff --cc include/74xx_7xx.h
index 7cd2f10b01,33e396a066..8eccac8d59
--- a/include/74xx_7xx.h
+++ b/include/74xx_7xx.h
@@@ -111,8 -111,8 +111,9 @@@ typedef enum __cpu_t 
  	CPU_750CX, CPU_750FX, CPU_750GX,
  	CPU_7400,
  	CPU_7410,
+ 	CPU_7448,
  	CPU_7450, CPU_7455, CPU_7457,
 +	CPU_7447A, CPU_7448,
  	CPU_UNKNOWN} cpu_t;
  
  extern cpu_t get_cpu_type(void);
diff --cc net/eth.c
index c291f1908f,cca9392059..44390d237b
--- a/net/eth.c
+++ b/net/eth.c
@@@ -52,9 -52,9 +52,10 @@@ extern int rtl8139_initialize(bd_t*)
  extern int rtl8169_initialize(bd_t*);
  extern int scc_initialize(bd_t*);
  extern int skge_initialize(bd_t*);
 +extern int tsi108_eth_initialize(bd_t*);
  extern int tsec_initialize(bd_t*, int, char *);
  extern int npe_initialize(bd_t *);
+ extern int uec_initialize(int);
  
  static struct eth_device *eth_devices, *eth_current;