summaryrefslogtreecommitdiff
path: root/arch/x86/cpu/ivybridge/model_206ax.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-23 18:32:47 -0400
committerTom Rini <trini@konsulko.com>2016-05-23 18:32:47 -0400
commit6d54868eeb2697c9a905c4d3521efbacc44c5258 (patch)
tree6ad3ae03a0083d1a50a6152bd6dcad5630ce7823 /arch/x86/cpu/ivybridge/model_206ax.c
parentd7d000311285e4b8d11e089ca13ea456a01be3b8 (diff)
parent8216b11cdd50515fbc423a4b2709a00865b8621d (diff)
downloadu-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.zip
u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.gz
u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/ivybridge/model_206ax.c')
-rw-r--r--arch/x86/cpu/ivybridge/model_206ax.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index cef4256..38e244b 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -12,10 +12,8 @@
#include <dm.h>
#include <fdtdec.h>
#include <malloc.h>
-#include <asm/acpi.h>
#include <asm/cpu.h>
#include <asm/cpu_x86.h>
-#include <asm/lapic.h>
#include <asm/msr.h>
#include <asm/msr-index.h>
#include <asm/mtrr.h>
@@ -419,7 +417,6 @@ static int model_206ax_init(struct udevice *dev)
/* Enable the local cpu apics */
enable_lapic_tpr();
- lapic_setup();
/* Enable virtualization if enabled in CMOS */
enable_vmx();