]> git.sur5r.net Git - u-boot/commitdiff
Merging Stelian Pop AT91 patches
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sat, 24 May 2008 10:56:53 +0000 (12:56 +0200)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sat, 24 May 2008 10:56:53 +0000 (12:56 +0200)
Merge branch 'testing-V2'

Conflicts:

board/atmel/at91cap9adk/Makefile
                Fixing copyright
board/atmel/at91sam9260ek/Makefile
                Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
                Delete no more needed ld script

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
1  2 
CHANGELOG
MAINTAINERS
MAKEALL
Makefile
README
board/atmel/at91sam9260ek/at91sam9260ek.c
common/env_nand.c
drivers/net/dm9000x.c
drivers/video/Makefile
fs/jffs2/jffs2_1pass.c
tools/Makefile

diff --cc CHANGELOG
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
Simple merge
Simple merge
index 9d2f65b7f8d937a5ce530f36c47c0b36c0542fcc,a07ee0ecafc6bfbfa2d9658d41dc11df71bb7a51..20a54c54dfa62bebc220bfccbedf04224f031ba1
  
  include $(TOPDIR)/config.mk
  
 -LIB   := $(obj)libvideo.a
 +LIB   := $(obj)libvideo.a
  
  COBJS-y += ati_radeon_fb.o
+ COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
  COBJS-y += cfb_console.o
  COBJS-y += ct69000.o
  COBJS-y += mb862xx.o
Simple merge
diff --cc tools/Makefile
Simple merge