From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Wed, 6 Aug 2008 13:12:38 +0000 (+0200)
Subject: Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
X-Git-Tag: v2008.10-rc1~152^2~1^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7772c13ba07eaabd42499998f3713b23350fc119;p=u-boot

Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32

Conflicts:

	MAINTAINERS
	MAKEALL
	Makefile
---

7772c13ba07eaabd42499998f3713b23350fc119
diff --cc MAINTAINERS
index bcac300224,0ff2addaf8..10a25e14a6
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -62,7 -62,7 +62,7 @@@ Joe D'Abbraccio <ljd015@freescale.com
  
  	MPC837xERDB	MPC837x
  
--Kári Davíðsson <kd@flaga.is>
++K�ri Dav��sson <kd@flaga.is>
  
  	FLAGADM		MPC823
  
@@@ -482,7 -482,7 +482,7 @@@ Peter Figuli <peposh@etc.sk
  
  	wepep250	xscale
  
--Marius Gröger <mag@sysgo.de>
++Marius Gr�ger <mag@sysgo.de>
  
  	impa7		ARM720T (EP7211)
  	ep7312		ARM720T (EP7312)
@@@ -514,7 -514,7 +514,7 @@@ Prakash Kumar <prakash@embedx.com
  
  	cerf250		xscale
  
--David Müller <d.mueller@elsoft.ch>
++David M�ller <d.mueller@elsoft.ch>
  
  	smdk2410	ARM920T
  	VCMA9		ARM920T
@@@ -570,7 -570,7 +570,7 @@@ Kyungmin Park <kyungmin.park@samsung.co
  
  	apollon		ARM1136EJS
  
--Alex Züpke <azu@sysgo.de>
++Alex Z�pke <azu@sysgo.de>
  
  	lart		SA1100
  	dnp1110		SA1110
@@@ -598,7 -598,7 +598,7 @@@ Unknown / orphaned boards
  #	Board		CPU						#
  #########################################################################
  
--Daniel Engström <daniel@omicron.se>
++Daniel Engstr�m <daniel@omicron.se>
  
  	sc520_cdp	x86
  
@@@ -709,11 -709,10 +709,15 @@@ Haavard Skinnemoen <hskinnemoen@atmel.c
  	ATSTK1006	AT32AP7000
  	ATNGW100	AT32AP7000
  
 +Alex Raimondi <alex.raimondi@miromico.ch>
 +Julien May <julien.may@miromico.ch>
 +
 +	HAMMERHEAD		AT32AP7000
 +
+ Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
+ 
+ 	FAVR-32-EZKIT		AT32AP7000
+ 
  #########################################################################
  # SuperH Systems:							#
  #									#
diff --cc MAKEALL
index d14cb79acf,76dd334db0..d7196db7fc
--- a/MAKEALL
+++ b/MAKEALL
@@@ -714,7 -714,7 +714,8 @@@ LIST_avr32="		
  	atstk1004	\
  	atstk1006	\
  	atngw100	\
+ 	favr-32-ezkit	\
 +	hammerhead	\
  "
  
  #########################################################################
diff --cc Makefile
index acc36f4ab6,ebbf2bce95..51d49ed34c
--- a/Makefile
+++ b/Makefile
@@@ -2911,9 -2911,9 +2911,12 @@@ atstk1004_config	:	unconfi
  atstk1006_config	:	unconfig
  	@$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
  
+ favr-32-ezkit_config	:	unconfig
+ 	@$(MKCONFIG) $(@:_config=) avr32 at32ap favr-32-ezkit earthlcd at32ap700x
+ 
 +hammerhead_config	:	unconfig
 +	@$(MKCONFIG) $(@:_config=) avr32 at32ap hammerhead miromico at32ap700x
 +
  #========================================================================
  # SH3 (SuperH)
  #========================================================================