From 5f9624d211a247c032a31b22c3b47158f7083c9e Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghailu@gmail.com>
Date: Wed, 4 Oct 2006 22:56:21 +0000
Subject: CONFIG_USE_PRINTK_IN_CAR and ht chain id for HTX support in
 serengeti_cheeatah

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2439 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/cpu/amd/car/copy_and_run.c         |  2 +-
 src/cpu/amd/car/disable_cache_as_ram.c | 24 +++++++++---------------
 src/cpu/amd/car/post_cache_as_ram.c    |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

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

diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c
index 7471a53076..344e6d1b54 100644
--- a/src/cpu/amd/car/copy_and_run.c
+++ b/src/cpu/amd/car/copy_and_run.c
@@ -4,7 +4,7 @@
 */
 static inline void print_debug_cp_run(const char *strval, uint32_t val)
 {
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
         printk_debug("%s%08x\r\n", strval, val);
 #else
         print_debug(strval); print_debug_hex32(val); print_debug("\r\n");
diff --git a/src/cpu/amd/car/disable_cache_as_ram.c b/src/cpu/amd/car/disable_cache_as_ram.c
index 56e60eefb7..fc30ee9ab1 100644
--- a/src/cpu/amd/car/disable_cache_as_ram.c
+++ b/src/cpu/amd/car/disable_cache_as_ram.c
@@ -2,6 +2,7 @@
 /* be warned, this file will be used other cores and core 0 / node 0 */
 static inline __attribute__((always_inline)) void disable_cache_as_ram(void)
 {
+
         __asm__ volatile (
 
         /* We don't need cache as ram for now on */
@@ -43,27 +44,20 @@ static inline __attribute__((always_inline)) void disable_cache_as_ram(void)
 
         );
 }
-/* be warned, this file will be used core 0 / node 0 and ram stack is ready*/
 
 static void disable_cache_as_ram_bsp(void)
 {
-        __asm__ volatile (
-
-        "pushl	%ecx\n\t"
-        "pushl 	%edx\n\t"
-        "pushl 	%eax\n\t"
-
+	__asm__ volatile (
+//		"pushl %eax\n\t"
+ 		"pushl %edx\n\t"
+ 		"pushl %ecx\n\t"
 	);
 
 	disable_cache_as_ram();
-
-	__asm__ volatile (
-
-        "popl   %eax\n\t"
-        "popl   %edx\n\t"
-        "popl   %ecx\n\t"
-
+        __asm__ volatile (
+                "popl %ecx\n\t"
+                "popl %edx\n\t"
+//                "popl %eax\n\t"
         );
 }
 
-
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 813745d66e..d47d552f79 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -7,7 +7,7 @@
 
 static inline void print_debug_pcar(const char *strval, uint32_t val)
 {
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
         printk_debug("%s%08x\r\n", strval, val);
 #else
         print_debug(strval); print_debug_hex32(val); print_debug("\r\n");
-- 
cgit v1.2.3