diff options
| author | Simon Glass <sjg@chromium.org> | 2015-01-01 16:18:13 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-01-13 07:25:01 -0800 |
| commit | 801d70ce026be4595e595fb6790621a6a898cee9 (patch) | |
| tree | 74f58d5ed26e67d2feb6f954a128f777cd3aea90 /arch/x86 | |
| parent | 7b00896ade7ee93504b5e5782bebe680705de1f6 (diff) | |
| download | u-boot-imx-801d70ce026be4595e595fb6790621a6a898cee9.zip u-boot-imx-801d70ce026be4595e595fb6790621a6a898cee9.tar.gz u-boot-imx-801d70ce026be4595e595fb6790621a6a898cee9.tar.bz2 | |
x86: Disable CAR before relocation on platforms that need it
For platforms with CAR we should disable it before relocation. Check if
this function is available and call it if so.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/start.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 125782c..f51f112 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -205,6 +205,14 @@ board_init_f_r_trampoline: /* Setup global descriptor table so gd->xyz works */ call setup_gdt + /* Set if we need to disable CAR */ +.weak car_uninit + movl $car_uninit, %eax + cmpl $0, %eax + jz 1f + + call car_uninit +1: /* Re-enter U-Boot by calling board_init_f_r */ call board_init_f_r |