summaryrefslogtreecommitdiff
path: root/arch/x86/cpu
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-10-28 09:28:26 -0400
committerTom Rini <trini@konsulko.com>2018-10-28 09:28:26 -0400
commitd735d3b6cb778012f05c2e3fca01df7f6ae6f035 (patch)
tree57ee69e6a2272c546105192a38c9389bb9999132 /arch/x86/cpu
parent22929e1266e9a61048bfaef381ad4fb2e2fc3ef5 (diff)
parent3d2be8003c77cad350f1ec7c79f914797718c5bf (diff)
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu')
-rw-r--r--arch/x86/cpu/start.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index e1f634ffcd..30fa7def46 100644
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -16,6 +16,7 @@
#include <asm/processor-flags.h>
#include <generated/generic-asm-offsets.h>
#include <generated/asm-offsets.h>
+#include <linux/linkage.h>
.section .text.start
.code32
@@ -184,13 +185,8 @@ board_init_f_r_trampoline:
movl %eax, %esp
/* See 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
@@ -199,6 +195,10 @@ die:
jmp die
hlt
+WEAK(car_uninit)
+ ret
+ENDPROC(car_uninit)
+
blank_idt_ptr:
.word 0 /* limit */
.long 0 /* base */