diff options
| author | Simon Glass <sjg@chromium.org> | 2011-04-28 09:57:45 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-24 09:56:21 -0700 |
| commit | 29897caccd59d51e110475edbaa483175f1f363f (patch) | |
| tree | 85206a6f7c12ddcbc2dcd866947ab53dd2ecb18d /arch/arm/cpu | |
| parent | fdbcf5a4ff6491f24d17a17636ace3ea6a1b8726 (diff) | |
Add option to disable code relocation
This permits disabling the code relation in U-Boot which is useful when
debugging with an ICE.
To use it define CONFIG_SYS_SKIP_ARM_RELOCATION in your board.
BUG=chromium-os:13875
TEST=build and boot U-Boot on seaboard with and without the option
Change-Id: I8242a80f491e975e16f9990cd17de8f3589c8991
Reviewed-on: http://gerrit.chromium.org/gerrit/193
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 27599cc26da..3cc8b946b37 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -183,7 +183,7 @@ stack_setup: adr r0, _start #ifndef CONFIG_PRELOADER - cmp r0, r6 + subs r9, r6, r0 /* r9 <- relocation offset */ beq clear_bss /* skip relocation */ #endif mov r1, r6 /* r1 <- scratch for copy_loop */ |