From: Wolfgang Denk <wd@denx.de>
Date: Sat, 10 Apr 2010 21:59:39 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-blackfin
X-Git-Tag: v2010.06-rc1~108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd4e49c18901a50b1648235f26da1e8caa0f8764;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-blackfin
---

fd4e49c18901a50b1648235f26da1e8caa0f8764
diff --combined MAINTAINERS
index 94839ce,b617953..04c8730
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -422,7 -422,6 +422,7 @@@ Andre Schwarz <andre.schwarz@matrix-vis
  
  	mvbc_p		MPC5200
  	mvblm7		MPC8343
 +	mvsmr		MPC5200
  
  Jon Smirl <jonsmirl@gmail.com>
  
@@@ -617,10 -616,6 +617,10 @@@ Simon Kagstrom <simon.kagstrom@netinsig
  
         openrd_base     ARM926EJS (Kirkwood SoC)
  
 +Minkyu Kang <mk7.kang@samsung.com>
 +
 +	SMDKC100	ARM CORTEX-A8 (S5PC100 SoC)
 +
  Nishant Kamat <nskamat@ti.com>
  
  	omap1610h2	ARM926EJS
@@@ -635,17 -630,17 +635,17 @@@ Sergey Kubushyn <ksi@koi8.net
  	SONATA		ARM926EJS
  	SCHMOOGIE	ARM926EJS
  
 -Sandeep Paulraj <s-paulraj@ti.com>
 -
 -	davinci_dm355evm	ARM926EJS
 -	davinci_dm355leopard	ARM926EJS
 -	davinci_dm365evm	ARM926EJS
 -	davinci_dm6467evm	ARM926EJS
 -
  Prakash Kumar <prakash@embedx.com>
  
  	cerf250		xscale
  
 +Vipin Kumar <vipin.kumar@st.com>
 +
 +	spear300	ARM926EJS (spear300 Soc)
 +	spear310	ARM926EJS (spear310 Soc)
 +	spear320	ARM926EJS (spear320 Soc)
 +	spear600	ARM926EJS (spear600 Soc)
 +
  Sergey Lapin <slapin@ossfans.org>
  
  	afeb9260	ARM926EJS (AT91SAM9260 SoC)
@@@ -678,13 -673,6 +678,13 @@@ Kyungmin Park <kyungmin.park@samsung.co
  
  	apollon		ARM1136EJS
  
 +Sandeep Paulraj <s-paulraj@ti.com>
 +
 +	davinci_dm355evm	ARM926EJS
 +	davinci_dm355leopard	ARM926EJS
 +	davinci_dm365evm	ARM926EJS
 +	davinci_dm6467evm	ARM926EJS
 +
  Peter Pearse <peter.pearse@arm.com>
  	integratorcp	All current ARM supplied & supported core modules
  			-see http://www.arm.com/products/DevTools/Hardware_Platforms.html
@@@ -785,6 -773,10 +785,6 @@@ Alex Züpke <azu@sysgo.de
  	lart		SA1100
  	dnp1110		SA1110
  
 -Minkyu Kang <mk7.kang@samsung.com>
 -
 -	SMDKC100	ARM CORTEX-A8 (S5PC100 SoC)
 -
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1016,6 -1008,10 +1016,10 @@@ Anton Shurpin <shurpin.aa@niistt.ru
  
  	BF561-ACVILON	BF561
  
+ Brent Kandetzki <brentk@teleco.com>
+ 
+ 	IP04		BF532
+ 
  #########################################################################
  # End of MAINTAINERS list						#
  #########################################################################
diff --combined MAKEALL
index dc17dba,3e64748..fb1f7a3
--- a/MAKEALL
+++ b/MAKEALL
@@@ -70,7 -70,6 +70,7 @@@ LIST_5xxx="		
  	motionpro	\
  	munices		\
  	MVBC_P		\
 +	MVSMR		\
  	o2dnt		\
  	pcm030		\
  	pf5200		\
@@@ -906,6 -905,7 +906,7 @@@ LIST_blackfin="		
  	cm-bf548	\
  	cm-bf561	\
  	ibf-dsp561	\
+ 	ip04		\
  	tcm-bf518	\
  	tcm-bf537	\
  "
diff --combined Makefile
index 412e359,0ab67bb..5d314c6
--- a/Makefile
+++ b/Makefile
@@@ -664,11 -664,6 +664,11 @@@ MVBC_P_config: unconfi
  	{   	echo "#define CONFIG_MVBC_P" 	>>$(obj)include/config.h; }
  	@$(MKCONFIG) -n $@ -a MVBC_P ppc mpc5xxx mvbc_p matrix_vision
  
 +MVSMR_config: unconfig
 +	@mkdir -p $(obj)include
 +	@mkdir -p $(obj)board/matrix_vision/mvsmr
 +	@$(MKCONFIG) $(@:_config=) ppc mpc5xxx mvsmr matrix_vision
 +
  o2dnt_config:	unconfig
  	@$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
  
@@@ -3559,7 -3554,7 +3559,7 @@@ BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf5
  	tcm-bf518 tcm-bf537
  
  # Misc third party boards
- BFIN_BOARDS += bf537-minotaur bf537-srv1 bf561-acvilon blackstamp
+ BFIN_BOARDS += bf537-minotaur bf537-srv1 bf561-acvilon blackstamp ip04
  
  # I-SYST Micromodule
  BFIN_BOARDS += ibf-dsp561