diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-26 15:10:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-26 15:10:40 -0400 |
| commit | 0031af9ce7b1c2d98ce77cc20bd7546d64e334fe (patch) | |
| tree | 196dda8bb4fdae67ec24514eac2372930e912acb /arch/x86/cpu | |
| parent | cc0427d2695220961f43dfb5e110511a9cb8ae16 (diff) | |
| parent | 438505fe696b176cbf56cd34db870e04027d3531 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/baytrail/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/tangier/Kconfig | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/turbo.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig index 75dbbc27f1..1d876b1927 100644 --- a/arch/x86/cpu/baytrail/Kconfig +++ b/arch/x86/cpu/baytrail/Kconfig @@ -8,6 +8,7 @@ config INTEL_BAYTRAIL bool select HAVE_FSP if !EFI select ARCH_MISC_INIT if !EFI + select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED imply HAVE_INTEL_ME if !EFI imply ENABLE_MRC_CACHE imply AHCI_PCI diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index 86a334047c..2469b1e7c7 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -16,6 +16,8 @@ config INTEL_TANGIER imply USB imply USB_DWC3 +if INTEL_TANGIER + config SYS_CAR_ADDR hex default 0x19200000 @@ -30,3 +32,5 @@ config SYS_CAR_SIZE config SYS_USB_OTG_BASE hex default 0xf9100000 + +endif diff --git a/arch/x86/cpu/turbo.c b/arch/x86/cpu/turbo.c index bbd255efc0..c0bff75c4f 100644 --- a/arch/x86/cpu/turbo.c +++ b/arch/x86/cpu/turbo.c @@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED +#ifdef CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED static inline int get_global_turbo_state(void) { return TURBO_UNKNOWN; |