diff options
| author | Tom Rini <trini@ti.com> | 2015-01-13 13:39:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-13 13:39:25 -0500 |
| commit | 5f88ed5cde04612e5b4520327b82d81a3f5493a0 (patch) | |
| tree | ae465a7b43e4a01fa4ec774f0199e86743c8d46a /arch/x86/cpu/start.S | |
| parent | 95f5c8f2269fc144fba5a21c0e9edf5311007484 (diff) | |
| parent | 657e384af630463e3c8c4ffbacd16c5e46aeb0e0 (diff) | |
| download | u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.zip u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.tar.gz u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.tar.bz2 | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/start.S')
| -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 |