diff options
| author | Tom Rini <trini@ti.com> | 2014-08-29 11:07:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-29 11:07:35 -0400 |
| commit | 7f14fb20f895016fb38d30ce71aeb4d441b5bcb8 (patch) | |
| tree | d413cf73725c528b786610896446834721decdd3 /arch/arm/cpu | |
| parent | 5ddc329341a9a143f0567494e5f874008b22e1a7 (diff) | |
| parent | ae2ee77f982d83a9aca06973e39bebb224b5201c (diff) | |
| download | blackbird-obmc-uboot-7f14fb20f895016fb38d30ce71aeb4d441b5bcb8.tar.gz blackbird-obmc-uboot-7f14fb20f895016fb38d30ce71aeb4d441b5bcb8.zip | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/u-boot-spl.lds | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index d73e5cbaa7..9ff2ef2ae3 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -8,7 +8,7 @@ #include <asm/io.h> #include <asm/arch/hardware.h> -#include <asm/arch/spl.h> +#include <asm/spl.h> #include <asm/arch/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv7/zynq/u-boot-spl.lds b/arch/arm/cpu/armv7/zynq/u-boot-spl.lds index 0c4501e5c7..0f2f756f83 100644 --- a/arch/arm/cpu/armv7/zynq/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/zynq/u-boot-spl.lds @@ -22,6 +22,7 @@ SECTIONS .text : { __image_copy_start = .; + *(.vectors) CPUDIR/start.o (.text*) *(.text*) } > .sram |
