Merge cpu/intel/acpi.h into cpu/intel/speedstep.h
We had only some MSR definitions in there, which are used in speedstep related code. I think speedstep.h is the better and less confusing place for these. Change-Id: I1eddea72c1e2d3b2f651468b08b3c6f88b713149 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: http://review.coreboot.org/1655 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
parent
bef3d347e8
commit
41392df0d1
|
@ -26,7 +26,6 @@
|
||||||
#include <arch/acpigen.h>
|
#include <arch/acpigen.h>
|
||||||
#include <arch/cpu.h>
|
#include <arch/cpu.h>
|
||||||
#include <cpu/x86/msr.h>
|
#include <cpu/x86/msr.h>
|
||||||
#include <cpu/intel/acpi.h>
|
|
||||||
#include <cpu/intel/speedstep.h>
|
#include <cpu/intel/speedstep.h>
|
||||||
#include <cpu/intel/turbo.h>
|
#include <cpu/intel/turbo.h>
|
||||||
#include <device/device.h>
|
#include <device/device.h>
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include <cpu/intel/microcode.h>
|
#include <cpu/intel/microcode.h>
|
||||||
#include <cpu/intel/hyperthreading.h>
|
#include <cpu/intel/hyperthreading.h>
|
||||||
#include <cpu/intel/speedstep.h>
|
#include <cpu/intel/speedstep.h>
|
||||||
#include <cpu/intel/acpi.h>
|
|
||||||
#include <cpu/x86/cache.h>
|
#include <cpu/x86/cache.h>
|
||||||
#include <cpu/x86/name.h>
|
#include <cpu/x86/name.h>
|
||||||
#include <usbdebug.h>
|
#include <usbdebug.h>
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
#include <cpu/x86/lapic.h>
|
#include <cpu/x86/lapic.h>
|
||||||
#include <cpu/intel/microcode.h>
|
#include <cpu/intel/microcode.h>
|
||||||
#include <cpu/intel/speedstep.h>
|
#include <cpu/intel/speedstep.h>
|
||||||
#include <cpu/intel/acpi.h>
|
|
||||||
#include <cpu/intel/hyperthreading.h>
|
#include <cpu/intel/hyperthreading.h>
|
||||||
#include <cpu/x86/cache.h>
|
#include <cpu/x86/cache.h>
|
||||||
#include <cpu/x86/name.h>
|
#include <cpu/x86/name.h>
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include <arch/acpigen.h>
|
#include <arch/acpigen.h>
|
||||||
#include <arch/cpu.h>
|
#include <arch/cpu.h>
|
||||||
#include <cpu/x86/msr.h>
|
#include <cpu/x86/msr.h>
|
||||||
#include <cpu/intel/acpi.h>
|
|
||||||
#include <cpu/intel/speedstep.h>
|
#include <cpu/intel/speedstep.h>
|
||||||
#include <device/device.h>
|
#include <device/device.h>
|
||||||
|
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of the coreboot project.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2010 Patrick Georgi <patrick@georgi-clan.de>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; version 2 of the License.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define IA32_PLATFORM_ID 0x017
|
|
||||||
#define IA32_PERF_STS 0x198
|
|
||||||
#define IA32_PERF_CTL 0x199
|
|
||||||
#define MSR_THERM2_CTL 0x19D
|
|
||||||
#define IA32_MISC_ENABLES 0x1A0
|
|
|
@ -32,3 +32,10 @@
|
||||||
*/
|
*/
|
||||||
#define PMB1_BASE 0x800
|
#define PMB1_BASE 0x800
|
||||||
|
|
||||||
|
|
||||||
|
/* Speedstep related MSRs */
|
||||||
|
#define IA32_PLATFORM_ID 0x017
|
||||||
|
#define IA32_PERF_STS 0x198
|
||||||
|
#define IA32_PERF_CTL 0x199
|
||||||
|
#define MSR_THERM2_CTL 0x19D
|
||||||
|
#define IA32_MISC_ENABLES 0x1A0
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <pc80/mc146818rtc.h>
|
#include <pc80/mc146818rtc.h>
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <cpu/x86/bist.h>
|
#include <cpu/x86/bist.h>
|
||||||
#include <cpu/intel/acpi.h>
|
#include <cpu/intel/speedstep.h>
|
||||||
#include "southbridge/intel/i3100/early_smbus.c"
|
#include "southbridge/intel/i3100/early_smbus.c"
|
||||||
#include "southbridge/intel/i3100/early_lpc.c"
|
#include "southbridge/intel/i3100/early_lpc.c"
|
||||||
#include "reset.c"
|
#include "reset.c"
|
||||||
|
|
Loading…
Reference in New Issue