diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-18 09:30:29 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-18 09:30:29 +0100 |
| commit | aa962c15bfc5dc4b8875abed818a43989f063641 (patch) | |
| tree | 8f79d5990b7545ce3474506dddb002c3cce58470 /board | |
| parent | a195ff95ace5e74e50f54a469d1a160ff84a1089 (diff) | |
| parent | 6d3e0107235aa0e6a6dcb77f9884497280bf85ad (diff) | |
| download | u-boot-imx-aa962c15bfc5dc4b8875abed818a43989f063641.zip u-boot-imx-aa962c15bfc5dc4b8875abed818a43989f063641.tar.gz u-boot-imx-aa962c15bfc5dc4b8875abed818a43989f063641.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'board')
| -rw-r--r-- | board/sc3/Makefile (renamed from board/solidcard3/Makefile) | 0 | ||||
| -rw-r--r-- | board/sc3/config.mk (renamed from board/solidcard3/config.mk) | 0 | ||||
| -rw-r--r-- | board/sc3/init.S (renamed from board/solidcard3/init.S) | 0 | ||||
| -rw-r--r-- | board/sc3/sc3.c (renamed from board/solidcard3/solidcard3.c) | 2 | ||||
| -rw-r--r-- | board/sc3/sc3.h (renamed from board/solidcard3/solidcard3.h) | 0 | ||||
| -rw-r--r-- | board/sc3/sc3nand.c (renamed from board/solidcard3/sc3nand.c) | 0 | ||||
| -rw-r--r-- | board/sc3/u-boot.lds (renamed from board/solidcard3/u-boot.lds) | 2 |
7 files changed, 2 insertions, 2 deletions
diff --git a/board/solidcard3/Makefile b/board/sc3/Makefile index 1b0b15f..1b0b15f 100644 --- a/board/solidcard3/Makefile +++ b/board/sc3/Makefile diff --git a/board/solidcard3/config.mk b/board/sc3/config.mk index 1bdf5e4..1bdf5e4 100644 --- a/board/solidcard3/config.mk +++ b/board/sc3/config.mk diff --git a/board/solidcard3/init.S b/board/sc3/init.S index e7b3c83..e7b3c83 100644 --- a/board/solidcard3/init.S +++ b/board/sc3/init.S diff --git a/board/solidcard3/solidcard3.c b/board/sc3/sc3.c index 21cc031..d94896e 100644 --- a/board/solidcard3/solidcard3.c +++ b/board/sc3/sc3.c @@ -33,7 +33,7 @@ #include <common.h> #include <asm/processor.h> #include <asm/io.h> -#include "solidcard3.h" +#include "sc3.h" #include <pci.h> #include <i2c.h> #include <malloc.h> diff --git a/board/solidcard3/solidcard3.h b/board/sc3/sc3.h index cf920f9..cf920f9 100644 --- a/board/solidcard3/solidcard3.h +++ b/board/sc3/sc3.h diff --git a/board/solidcard3/sc3nand.c b/board/sc3/sc3nand.c index 7daa877..7daa877 100644 --- a/board/solidcard3/sc3nand.c +++ b/board/sc3/sc3nand.c diff --git a/board/solidcard3/u-boot.lds b/board/sc3/u-boot.lds index dcd5601..dc255d2 100644 --- a/board/solidcard3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -62,7 +62,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/ppc4xx/start.o (.text) - board/solidcard3/init.o (.text) + board/sc3/init.o (.text) cpu/ppc4xx/kgdb.o (.text) cpu/ppc4xx/traps.o (.text) cpu/ppc4xx/interrupts.o (.text) |