1 files changed, 18 insertions, 25 deletions

diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c
index 75cf0290a9..43f9e7f285 100644
--- a/src/mainboard/hp/dl145_g3/romstage.c
+++ b/src/mainboard/hp/dl145_g3/romstage.c
@@ -79,7 +79,7 @@
 
 #include "northbridge/amd/amdk8/debug.c"
 
-#include "cpu/amd/mtrr/amd_earlymtrr.c"
+#include "cpu/x86/mtrr/earlymtrr.c"
 
 #include "northbridge/amd/amdk8/setup_resource_map.c"
 
@@ -88,10 +88,6 @@
 
 #include "southbridge/broadcom/bcm5785/bcm5785_early_setup.c"
 
-static void memreset_setup(void)
-{
-}
-
 static void memreset(int controllers, const struct mem_controller *ctrl)
 {
 }
@@ -185,36 +181,34 @@ static void setup_early_ipmi_serial()
 void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 {
 	static const uint16_t spd_addr[] = {
-		//first node
+		// first node
 		 DIMM0, DIMM2, 0, 0,
 		 DIMM1, DIMM3, 0, 0,
-#if CONFIG_MAX_PHYSICAL_CPUS > 1
-		//second node
+
+		// second node
 		DIMM4, DIMM6, 0, 0,
 		DIMM5, DIMM7, 0, 0,
-#endif
-
 	};
 
 	struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);
 
-	 int needs_reset;
-	 unsigned bsp_apicid = 0;
+	int needs_reset;
+	unsigned bsp_apicid = 0;
 
-	 if (!cpu_init_detectedx && boot_cpu()) {
-		 /* Nothing special needs to be done to find bus 0 */
-		 /* Allow the HT devices to be found */
+	if (!cpu_init_detectedx && boot_cpu()) {
+		/* Nothing special needs to be done to find bus 0 */
+		/* Allow the HT devices to be found */
 
-		 enumerate_ht_chain();
-		 bcm5785_enable_rom();
-		 bcm5785_enable_lpc();
-		 //enable RTC
+		enumerate_ht_chain();
+		bcm5785_enable_rom();
+		bcm5785_enable_lpc();
+		//enable RTC
 		pc87417_enable_dev(RTC_DEV);
-	 }
+	}
 
-	 if (bist == 0) {
-		 bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
-	 }
+	if (bist == 0) {
+		bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
+	}
 
 	pilot_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 
@@ -284,10 +278,9 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr);
 	enable_smbus();
 
-	memreset_setup();
 	//do we need apci timer, tsc...., only debug need it for better output
 	/* all ap stopped? */
-//	init_timer(); // Need to use TMICT to synconize FID/VID
+	// init_timer(); // Need to use TMICT to synconize FID/VID
 
 	sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);