diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-10 15:20:50 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-10 15:20:50 +0900 |
| commit | 9d62f20d0861ef87460d073dc189c851715b46ae (patch) | |
| tree | 43a05c86e947f01079879735ddf93218870df50b /board/cogent/u-boot.lds.debug | |
| parent | 6596753387c3310b86f75bebe464684d70651052 (diff) | |
| parent | e0531f975ce124f4ebdd9c7b7b107673c5628f68 (diff) | |
| download | u-boot-imx-9d62f20d0861ef87460d073dc189c851715b46ae.zip u-boot-imx-9d62f20d0861ef87460d073dc189c851715b46ae.tar.gz u-boot-imx-9d62f20d0861ef87460d073dc189c851715b46ae.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/cogent/u-boot.lds.debug')
| -rw-r--r-- | board/cogent/u-boot.lds.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index 57cc305..c218905 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - arch/ppc/cpu/mpc8xx/start.o (.text) + arch/powerpc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) |