diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-15 10:41:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-15 10:41:20 -0400 |
| commit | 605e15db2b54302364a2528d3c6604fbc57be846 (patch) | |
| tree | 1a1e344964bff1719939183124d66a71e7ca7731 /arch/x86/cpu/ivybridge | |
| parent | 4905dfc65d9a17083727865302d2cf633c15c911 (diff) | |
| parent | f110da9984c0aa0aba9e1c4178b67b7abecf7e8d (diff) | |
| download | u-boot-imx-605e15db2b54302364a2528d3c6604fbc57be846.zip u-boot-imx-605e15db2b54302364a2528d3c6604fbc57be846.tar.gz u-boot-imx-605e15db2b54302364a2528d3c6604fbc57be846.tar.bz2 | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/ivybridge')
| -rw-r--r-- | arch/x86/cpu/ivybridge/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/model_206ax.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig index e4595be..0e249a4 100644 --- a/arch/x86/cpu/ivybridge/Kconfig +++ b/arch/x86/cpu/ivybridge/Kconfig @@ -95,7 +95,6 @@ config CPU_SPECIFIC_OPTIONS select ARCH_BOOTBLOCK_X86_32 select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 - select SMP select SSE2 select UDELAY_LAPIC select CPU_MICROCODE_IN_CBFS diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index 8b08c40..fd7db97 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -13,12 +13,12 @@ #include <asm/acpi.h> #include <asm/cpu.h> #include <asm/lapic.h> -#include <asm/lapic_def.h> #include <asm/msr.h> #include <asm/mtrr.h> #include <asm/processor.h> #include <asm/speedstep.h> #include <asm/turbo.h> +#include <asm/arch/bd82x6x.h> #include <asm/arch/model_206ax.h> static void enable_vmx(void) |