From 45f6c5e3d450053e53a8ff4a687fd0dcaf2d7475 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Mon, 10 Apr 2006 16:40:19 +0000
Subject: add cpureginit to romcc code.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2249 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/cpu/amd/model_gx2/cpureginit.c     | 26 +++++---------------------
 src/cpu/amd/model_gx2/model_gx2_init.c |  2 --
 2 files changed, 5 insertions(+), 23 deletions(-)

(limited to 'src/cpu/amd/model_gx2')

diff --git a/src/cpu/amd/model_gx2/cpureginit.c b/src/cpu/amd/model_gx2/cpureginit.c
index 9cd928ecbe..e50079955e 100644
--- a/src/cpu/amd/model_gx2/cpureginit.c
+++ b/src/cpu/amd/model_gx2/cpureginit.c
@@ -1,15 +1,4 @@
-#include <console/console.h>
-#include <arch/io.h>
-#include <stdint.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bitops.h>
-#include <cpu/amd/gx2def.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/cache.h>
+
 
 /* ***************************************************************************/
 /* **/
@@ -79,14 +68,14 @@ BIST(void){
 	return;
 
 BISTFail:
-	printk_err("BIST failed!\n");
+	print_err("BIST failed!\n");
 	while(1);
 }
 /* ***************************************************************************/
 /* *	cpuRegInit*/
 /* ***************************************************************************/
 void
-cpuRegInit (int diagmode){
+cpuRegInit (void){
 	int msrnum;
 	msr_t msr;
 	/*  Turn on BTM for early debug based on setup. */
@@ -196,11 +185,6 @@ cpuRegInit (int diagmode){
 	msr.lo |= DOTPPL_LOWER_PD_SET;
 	wrmsr(msrnum, msr);
 
-/* */
-/*  Set the Delay Control in GLCP*/
-/* */
-/*	SetDelayControl();*/
-
 /* */
 /*  Enable RSDC*/
 /* */
@@ -215,7 +199,7 @@ cpuRegInit (int diagmode){
 /* */
 	/*if (getnvram( TOKEN_BIST_ENABLE) & == TVALUE_DISABLE) {*/
 	{
-		BIST();
+//		BIST();
 	}
 
 
@@ -303,6 +287,6 @@ MTestPinCheckBX (void){
 	}
 
 	/*  Lock the cache down here.*/
-	wbinvd();
+	__asm__("wbinvd\n");
 
 }
diff --git a/src/cpu/amd/model_gx2/model_gx2_init.c b/src/cpu/amd/model_gx2/model_gx2_init.c
index 185faf2197..9fc5d2679d 100644
--- a/src/cpu/amd/model_gx2/model_gx2_init.c
+++ b/src/cpu/amd/model_gx2/model_gx2_init.c
@@ -73,8 +73,6 @@ unsigned long addr;
 }
 #endif
 
-#include "cpureginit.c"
-
 static void model_gx2_init(device_t dev)
 {
 	void do_vsmbios(void);
-- 
cgit v1.2.3