Martin Roth merged this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
src/cpu: Remove unneeded includes

Change-Id: I8fb03ada29b37f96fb02122462dfb8ec7faa9d31
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26732
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M src/cpu/intel/fsp_model_206ax/bootblock.c
M src/cpu/intel/model_65x/model_65x_init.c
M src/cpu/intel/model_67x/model_67x_init.c
M src/cpu/intel/model_68x/model_68x_init.c
M src/cpu/intel/model_69x/model_69x_init.c
M src/cpu/intel/model_6bx/model_6bx_init.c
M src/cpu/intel/model_6dx/model_6dx_init.c
M src/cpu/intel/slot_1/l2_cache.c
M src/cpu/x86/lapic/lapic.c
M src/cpu/x86/tsc/delay_tsc.c
10 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/src/cpu/intel/fsp_model_206ax/bootblock.c b/src/cpu/intel/fsp_model_206ax/bootblock.c
index ed68883..297edd2 100644
--- a/src/cpu/intel/fsp_model_206ax/bootblock.c
+++ b/src/cpu/intel/fsp_model_206ax/bootblock.c
@@ -13,15 +13,7 @@
* GNU General Public License for more details.
*/

-#include <stdint.h>
-#include <arch/cpu.h>
-#include <cpu/x86/cache.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
-#include <arch/io.h>
-
#include <cpu/intel/microcode/microcode.c>
-#include "model_206ax.h"

static void bootblock_cpu_init(void)
{
diff --git a/src/cpu/intel/model_65x/model_65x_init.c b/src/cpu/intel/model_65x/model_65x_init.c
index 9eab9c7..dde3427 100644
--- a/src/cpu/intel/model_65x/model_65x_init.c
+++ b/src/cpu/intel/model_65x/model_65x_init.c
@@ -14,11 +14,9 @@
* GNU General Public License for more details.
*/

-#include <stdint.h>
#include <device/device.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
-#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
diff --git a/src/cpu/intel/model_67x/model_67x_init.c b/src/cpu/intel/model_67x/model_67x_init.c
index 4fd51d3..130105ee 100644
--- a/src/cpu/intel/model_67x/model_67x_init.c
+++ b/src/cpu/intel/model_67x/model_67x_init.c
@@ -14,15 +14,12 @@
* GNU General Public License for more details.
*/

-#include <console/console.h>
-#include <string.h>
#include <device/device.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
-#include <cpu/x86/msr.h>
#include <cpu/intel/l2_cache.h>

static void model_67x_init(struct device *cpu)
diff --git a/src/cpu/intel/model_68x/model_68x_init.c b/src/cpu/intel/model_68x/model_68x_init.c
index 17c9eb7..4c549bc 100644
--- a/src/cpu/intel/model_68x/model_68x_init.c
+++ b/src/cpu/intel/model_68x/model_68x_init.c
@@ -17,10 +17,8 @@

#include <console/console.h>
#include <device/device.h>
-#include <string.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
-#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
diff --git a/src/cpu/intel/model_69x/model_69x_init.c b/src/cpu/intel/model_69x/model_69x_init.c
index 785c480..fe7d2ca 100644
--- a/src/cpu/intel/model_69x/model_69x_init.c
+++ b/src/cpu/intel/model_69x/model_69x_init.c
@@ -11,12 +11,9 @@
* GNU General Public License for more details.
*/

-#include <console/console.h>
#include <device/device.h>
-#include <string.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
-#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index ce70539..617c8aa 100644
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@@ -17,10 +17,8 @@

#include <console/console.h>
#include <device/device.h>
-#include <string.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
-#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
diff --git a/src/cpu/intel/model_6dx/model_6dx_init.c b/src/cpu/intel/model_6dx/model_6dx_init.c
index 6097c33..337b613 100644
--- a/src/cpu/intel/model_6dx/model_6dx_init.c
+++ b/src/cpu/intel/model_6dx/model_6dx_init.c
@@ -11,12 +11,9 @@
* GNU General Public License for more details.
*/

-#include <console/console.h>
#include <device/device.h>
-#include <string.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
-#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
diff --git a/src/cpu/intel/slot_1/l2_cache.c b/src/cpu/intel/slot_1/l2_cache.c
index 05eaeb3..617a4e6 100644
--- a/src/cpu/intel/slot_1/l2_cache.c
+++ b/src/cpu/intel/slot_1/l2_cache.c
@@ -40,9 +40,7 @@

#include <stdint.h>
#include <console/console.h>
-#include <string.h>
#include <cpu/cpu.h>
-#include <cpu/x86/mtrr.h>
#include <cpu/intel/l2_cache.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/msr.h>
diff --git a/src/cpu/x86/lapic/lapic.c b/src/cpu/x86/lapic/lapic.c
index ca0ff94..8cd3092 100644
--- a/src/cpu/x86/lapic/lapic.c
+++ b/src/cpu/x86/lapic/lapic.c
@@ -13,8 +13,6 @@

#include <cpu/x86/lapic.h>
#include <console/console.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>

void do_lapic_init(void)
{
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index ec2f1d7..04f709f 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -14,7 +14,6 @@
#include <arch/early_variables.h>
#include <console/console.h>
#include <arch/io.h>
-#include <cpu/x86/msr.h>
#include <cpu/x86/tsc.h>
#include <smp/spinlock.h>
#include <delay.h>

To view, visit change 26732. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fb03ada29b37f96fb02122462dfb8ec7faa9d31
Gerrit-Change-Number: 26732
Gerrit-PatchSet: 6
Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>