projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: qemu: Adjust VGA initialization
[oweals/u-boot.git]
/
arch
/
x86
/
cpu
/
start.S
diff --git
a/arch/x86/cpu/start.S
b/arch/x86/cpu/start.S
index 125782cf2796768bf281dc204f75355686b7827c..2e5f9da75673c55397d58ec18d858f5fa1c34a4a 100644
(file)
--- a/
arch/x86/cpu/start.S
+++ b/
arch/x86/cpu/start.S
@@
-11,7
+11,6
@@
*/
#include <config.h>
*/
#include <config.h>
-#include <version.h>
#include <asm/global_data.h>
#include <asm/post.h>
#include <asm/processor.h>
#include <asm/global_data.h>
#include <asm/post.h>
#include <asm/processor.h>
@@
-205,6
+204,14
@@
board_init_f_r_trampoline:
/* Setup global descriptor table so gd->xyz works */
call setup_gdt
/* 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
/* Re-enter U-Boot by calling board_init_f_r */
call board_init_f_r