From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Wed, 20 Aug 2008 07:12:28 +0000 (+0200)
Subject: Merge branch 'mimc200' of git://git.denx.de/u-boot-avr32
X-Git-Tag: v2008.10-rc1~152^2~1^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7321d7e7b6a96a9eed02e65d2d4377391dc7ea83;p=u-boot

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

Conflicts:

	MAKEALL
	Makefile
---

7321d7e7b6a96a9eed02e65d2d4377391dc7ea83
diff --cc MAKEALL
index d7196db7fc,fcd9310f7c..82a84c9d09
--- a/MAKEALL
+++ b/MAKEALL
@@@ -714,8 -714,7 +714,9 @@@ LIST_avr32="		
  	atstk1004	\
  	atstk1006	\
  	atngw100	\
 +	favr-32-ezkit	\
 +	hammerhead	\
+ 	mimc200		\
  "
  
  #########################################################################
diff --cc Makefile
index 51d49ed34c,a74f33b2ab..fe5bf11553
--- a/Makefile
+++ b/Makefile
@@@ -2911,12 -2911,9 +2911,15 @@@ 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
 +
+ mimc200_config		:	unconfig
+ 	@$(MKCONFIG) $(@:_config=) avr32 at32ap mimc200 mimc at32ap700x
+ 
  #========================================================================
  # SH3 (SuperH)
  #========================================================================