From: Peter Pearse <peter.pearse@arm.com>
Date: Fri, 15 Feb 2008 13:00:22 +0000 (+0000)
Subject: Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev
X-Git-Tag: v1.3.2-rc2~37^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=faf8f9bc95e526446c3b0554ebdc22af1291e72a;p=oweals%2Fu-boot.git

Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev
---

faf8f9bc95e526446c3b0554ebdc22af1291e72a
diff --cc Makefile
index 326c33cc44,1f63b8bc44..a731ee8979
--- a/Makefile
+++ b/Makefile
@@@ -2310,11 -2301,8 +2310,11 @@@ xtract_omap1610xxx = $(subst _cs0boot,,
  
  xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
  
 +at91cap9adk_config	:	unconfig
 +	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9
 +
  at91rm9200dk_config	:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
+ 	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
  
  cmc_pu2_config	:	unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200