git.openpandora.org / pandora-u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7d9afa 6523010)
Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev
authorPeter Pearse <peter.pearse@arm.com>
Fri, 15 Feb 2008 13:00:22 +0000 (13:00 +0000)
committerPeter Pearse <peter.pearse@arm.com>
Fri, 15 Feb 2008 13:00:22 +0000 (13:00 +0000)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
index 326c33c,1f63b8b..a731ee8
--- 1/Makefile
--- 2/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
Pandora U-Boot Repository