Remove some duplicate #include files (trivial).

[coreboot.git] / src / cpu / amd / model_fxx / model_fxx_init.c

diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c
index 20770e7a119b8863ee1d472dd8a5f4cf5844e6dc..865198a52aa48809c63cc61b8795442e15da385f 100644 (file)
--- a/src/cpu/amd/model_fxx/model_fxx_init.c
+++ b/src/cpu/amd/model_fxx/model_fxx_init.c
@@ -6,7 +6,8 @@
 
  * Copyright 2005 AMD
  * 2005.08 yhlu add microcode support
-*/
+ */
+
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
@@ -17,17 +18,13 @@
 #include <cpu/x86/pae.h>
 #include <pc80/mc146818rtc.h>
 #include <cpu/x86/lapic.h>
-
-#include "../../../northbridge/amd/amdk8/amdk8.h"
-
+#include "northbridge/amd/amdk8/amdk8.h"
 #include <cpu/amd/model_fxx_rev.h>
 #include <cpu/amd/microcode.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
-
 #include <cpu/amd/multicore.h>
-
 #include <cpu/amd/model_fxx_msr.h>
 
 #if CONFIG_WAIT_BEFORE_CPUS_INIT
@@ -110,6 +107,7 @@ struct mtrr {
        msr_t base;
        msr_t mask;
 };
+
 struct mtrr_state {
        struct mtrr mtrrs[MTRR_COUNT];
        msr_t top_mem, top_mem2;
@@ -462,7 +460,7 @@ static inline void k8_errata(void)
 
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -471,17 +469,8 @@ static void model_fxx_init(device_t dev)
        unsigned long i;
        msr_t msr;
        struct node_core_id id;
-#if CONFIG_LOGICAL_CPUS == 1
-       u32 siblings;
-#endif
 
-#if CONFIG_K8_REV_F_SUPPORT == 1
-       struct cpuinfo_x86 c;
-
-       get_fms(&c, dev->device);
-#endif
-
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
        if (!ehci_debug_addr)
                ehci_debug_addr = get_ehci_debug();
        set_ehci_debug(0);
@@ -492,7 +481,7 @@ static void model_fxx_init(device_t dev)
        amd_setup_mtrrs();
        x86_mtrr_check();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
        set_ehci_debug(ehci_debug_addr);
 #endif
 
@@ -524,7 +513,7 @@ static void model_fxx_init(device_t dev)
        setup_lapic();
 
 #if CONFIG_LOGICAL_CPUS == 1
-       siblings = cpuid_ecx(0x80000008) & 0xff;
+       u32 siblings = cpuid_ecx(0x80000008) & 0xff;
 
        if (siblings > 0) {
                msr = rdmsr_amd(CPU_ID_FEATURES_MSR);
@@ -548,12 +537,6 @@ static void model_fxx_init(device_t dev)
         */
        if (id.coreid == 0)
                init_ecc_memory(id.nodeid);     // only do it for core 0
-
-#if CONFIG_LOGICAL_CPUS==1
-       /* Start up my cpu siblings */
-//      if(id.coreid==0)  amd_sibling_init(dev); // Don't need core1 is already be put in the CPU BUS in bus_cpu_scan
-#endif
-
 }
 
 static struct device_operations cpu_dev_ops = {