diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-05 07:22:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-05 07:22:18 -0500 |
| commit | 02ebe6f702ec8d025926b0ea7c2088e302c5a302 (patch) | |
| tree | 15e249ac39e9c547668327218e63a0faf54a3283 /arch/arm/cpu/arm1136/mx35 | |
| parent | 7ae8350f67eea861280a4cbd2d067777a0e87153 (diff) | |
| parent | 32df39c741788e8637cffe6633d73594b26d70fb (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/arm1136/mx35')
| -rw-r--r-- | arch/arm/cpu/arm1136/mx35/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm1136/mx35/relocate.S | 23 |
2 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile index c533215c3a..796db9c7cc 100644 --- a/arch/arm/cpu/arm1136/mx35/Makefile +++ b/arch/arm/cpu/arm1136/mx35/Makefile @@ -10,3 +10,7 @@ obj-y += generic.o obj-y += timer.o obj-y += mx35_sdram.o + +ifndef CONFIG_SPL_BUILD +obj-y += relocate.o +endif diff --git a/arch/arm/cpu/arm1136/mx35/relocate.S b/arch/arm/cpu/arm1136/mx35/relocate.S new file mode 100644 index 0000000000..43003f8044 --- /dev/null +++ b/arch/arm/cpu/arm1136/mx35/relocate.S @@ -0,0 +1,23 @@ +/* + * relocate - i.MX35-specific vector relocation + * + * Copyright (c) 2013 Albert ARIBAUD <albert.u.boot@aribaud.net> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <linux/linkage.h> + +/* + * The i.MX35 SoC is very specific with respect to exceptions: it + * does not provide RAM at the high vectors address (0xFFFF0000), + * thus only the low address (0x00000000) is useable; but that is + * in ROM, so let's avoid relocating the vectors. + */ + .section .text.relocate_vectors,"ax",%progbits + +ENTRY(relocate_vectors) + + bx lr + +ENDPROC(relocate_vectors) |