diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2008-02-15 13:00:22 +0000 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2008-02-15 13:00:22 +0000 |
| commit | faf8f9bc95e526446c3b0554ebdc22af1291e72a (patch) | |
| tree | 4240c05b3ccc6faaf9158dc34a1322eee0f491c7 | |
| parent | d7d9afa48cfa5b07089e3694859a377676a81bd1 (diff) | |
| parent | 65230107025733e89e28fd5e5cfd916d4953c28a (diff) | |
| download | u-boot-imx-faf8f9bc95e526446c3b0554ebdc22af1291e72a.zip u-boot-imx-faf8f9bc95e526446c3b0554ebdc22af1291e72a.tar.gz u-boot-imx-faf8f9bc95e526446c3b0554ebdc22af1291e72a.tar.bz2 | |
Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | board/atmel/at91rm9200dk/Makefile (renamed from board/at91rm9200dk/Makefile) | 0 | ||||
| -rw-r--r-- | board/atmel/at91rm9200dk/at91rm9200dk.c (renamed from board/at91rm9200dk/at91rm9200dk.c) | 0 | ||||
| -rw-r--r-- | board/atmel/at91rm9200dk/config.mk (renamed from board/at91rm9200dk/config.mk) | 0 | ||||
| -rw-r--r-- | board/atmel/at91rm9200dk/flash.c (renamed from board/at91rm9200dk/flash.c) | 0 | ||||
| -rw-r--r-- | board/atmel/at91rm9200dk/led.c (renamed from board/at91rm9200dk/led.c) | 0 | ||||
| -rw-r--r-- | board/atmel/at91rm9200dk/mux.c (renamed from board/at91rm9200dk/mux.c) | 0 | ||||
| -rw-r--r-- | board/atmel/at91rm9200dk/u-boot.lds (renamed from board/at91rm9200dk/u-boot.lds) | 0 |
8 files changed, 1 insertions, 1 deletions
@@ -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 diff --git a/board/at91rm9200dk/Makefile b/board/atmel/at91rm9200dk/Makefile index 01f3bc3..01f3bc3 100755 --- a/board/at91rm9200dk/Makefile +++ b/board/atmel/at91rm9200dk/Makefile diff --git a/board/at91rm9200dk/at91rm9200dk.c b/board/atmel/at91rm9200dk/at91rm9200dk.c index c564f73..c564f73 100644 --- a/board/at91rm9200dk/at91rm9200dk.c +++ b/board/atmel/at91rm9200dk/at91rm9200dk.c diff --git a/board/at91rm9200dk/config.mk b/board/atmel/at91rm9200dk/config.mk index 9ce161e..9ce161e 100644 --- a/board/at91rm9200dk/config.mk +++ b/board/atmel/at91rm9200dk/config.mk diff --git a/board/at91rm9200dk/flash.c b/board/atmel/at91rm9200dk/flash.c index 0513d61..0513d61 100644 --- a/board/at91rm9200dk/flash.c +++ b/board/atmel/at91rm9200dk/flash.c diff --git a/board/at91rm9200dk/led.c b/board/atmel/at91rm9200dk/led.c index 47a3bfc..47a3bfc 100644 --- a/board/at91rm9200dk/led.c +++ b/board/atmel/at91rm9200dk/led.c diff --git a/board/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c index 767d280..767d280 100644 --- a/board/at91rm9200dk/mux.c +++ b/board/atmel/at91rm9200dk/mux.c diff --git a/board/at91rm9200dk/u-boot.lds b/board/atmel/at91rm9200dk/u-boot.lds index 14cd228..14cd228 100644 --- a/board/at91rm9200dk/u-boot.lds +++ b/board/atmel/at91rm9200dk/u-boot.lds |