diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-04-19 10:26:18 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-04-19 10:26:18 +0900 |
| commit | 83653121d7382fccfe329cb732f77f116341ef1d (patch) | |
| tree | 0b1ce6764252af15dfb2614372de98a44a7ec61f /board/prodrive | |
| parent | 0f1f21a345e02a68ec16f7ab9e7dc687f9276089 (diff) | |
| parent | 07739bcef5da07cc4a4edef8b91014ccc332eda3 (diff) | |
| download | u-boot-imx-83653121d7382fccfe329cb732f77f116341ef1d.zip u-boot-imx-83653121d7382fccfe329cb732f77f116341ef1d.tar.gz u-boot-imx-83653121d7382fccfe329cb732f77f116341ef1d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm1176/cpu.c
cpu/arm1176/start.S
cpu/arm_cortexa8/s5pc1xx/Makefile
cpu/arm_cortexa8/s5pc1xx/clock.c
drivers/serial/serial_s5p.c
include/asm-arm/arch-s5pc1xx/clk.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/asm-arm/arch-s5pc1xx/uart.h
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/prodrive')
| -rw-r--r-- | board/prodrive/alpr/fpga.c | 2 | ||||
| -rw-r--r-- | board/prodrive/p3mx/u-boot.lds | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c index 7571cd9..f3bc1fa 100644 --- a/board/prodrive/alpr/fpga.c +++ b/board/prodrive/alpr/fpga.c @@ -30,7 +30,7 @@ #include <altera.h> #include <ACEX1K.h> #include <command.h> -#include <asm-ppc/processor.h> +#include <asm/processor.h> #include <ppc440.h> #include "fpga.h" diff --git a/board/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds index d021331..6dff003 100644 --- a/board/prodrive/p3mx/u-boot.lds +++ b/board/prodrive/p3mx/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ |