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

2008-02-15 13:00:22 +00:00 · 2008-02-15 13:00:22 +00:00 · faf8f9bc95
parent d7d9afa48c 6523010702
commit faf8f9bc95
8 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -2314,7 +2314,7 @@ 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
--- a/board/atmel/at91rm9200dk/Makefile
+++ b/board/atmel/at91rm9200dk/Makefile
--- a/board/atmel/at91rm9200dk/at91rm9200dk.c
+++ b/board/atmel/at91rm9200dk/at91rm9200dk.c
--- a/board/atmel/at91rm9200dk/config.mk
+++ b/board/atmel/at91rm9200dk/config.mk
--- a/board/atmel/at91rm9200dk/flash.c
+++ b/board/atmel/at91rm9200dk/flash.c
--- a/board/atmel/at91rm9200dk/led.c
+++ b/board/atmel/at91rm9200dk/led.c
--- a/board/atmel/at91rm9200dk/mux.c
+++ b/board/atmel/at91rm9200dk/mux.c
--- a/board/atmel/at91rm9200dk/u-boot.lds
+++ b/board/atmel/at91rm9200dk/u-boot.lds