Remove PRINTK_IN_CAR tests from AMD files.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4826 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 0 insertions, 43 deletions

diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 611f78d5ea..147a56d618 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -7,11 +7,7 @@
 
 static inline void print_debug_pcar(const char *strval, uint32_t val)
 {
-#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");
-#endif
 }
 
 static void inline __attribute__((always_inline))  memcopy(void *dest, const void *src, unsigned long bytes)
diff --git a/src/cpu/amd/model_fxx/fidvid.c b/src/cpu/amd/model_fxx/fidvid.c
index f079776f25..47ddbdf44c 100644
--- a/src/cpu/amd/model_fxx/fidvid.c
+++ b/src/cpu/amd/model_fxx/fidvid.c
@@ -15,33 +15,21 @@
 static inline void print_debug_fv(const char *str, unsigned val)
 {
 #if K8_SET_FIDVID_DEBUG == 1
-	#if CONFIG_USE_PRINTK_IN_CAR
 		printk_debug("%s%x\r\n", str, val);
-	#else
-		print_debug(str); print_debug_hex32(val); print_debug("\r\n");
-	#endif
 #endif
 }
 
 static inline void print_debug_fv_8(const char *str, unsigned val)
 {
 #if K8_SET_FIDVID_DEBUG == 1
-	#if CONFIG_USE_PRINTK_IN_CAR
 		printk_debug("%s%02x\r\n", str, val);
-	#else
-		print_debug(str); print_debug_hex8(val); print_debug("\r\n");
-	#endif
 #endif
 }
 
 static inline void print_debug_fv_64(const char *str, unsigned val, unsigned val2)
 {
 #if K8_SET_FIDVID_DEBUG == 1
-	#if CONFIG_USE_PRINTK_IN_CAR
 		printk_debug("%s%x%x\r\n", str, val, val2);
-	#else
-		print_debug(str); print_debug_hex32(val); print_debug_hex32(val2); print_debug("\r\n");
-	#endif
 #endif
 }
 
@@ -143,11 +131,7 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
 	apicidx = lapicid();
 
 	if (apicid != apicidx) {
-#if CONFIG_USE_PRINTK_IN_CAR
 		printk_err("wrong apicid, we want change %x, but it is %x\r\n", apicid, apicidx);
-#else
-		print_err("wrong apicid, we want change "); print_err_hex8(apicid); print_err(" but it is "); print_err_hex8(apicidx); print_err("\r\n");
-#endif
 		return fidvid;
 	}
 
diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c
index f3f2f582f5..a0ff1d73bc 100644
--- a/src/cpu/amd/model_fxx/init_cpus.c
+++ b/src/cpu/amd/model_fxx/init_cpus.c
@@ -16,39 +16,23 @@
 
 static inline void print_initcpu8 (const char *strval, unsigned val)
 {
-#if CONFIG_USE_PRINTK_IN_CAR
         printk_debug("%s%02x\r\n", strval, val);
-#else
-        print_debug(strval); print_debug_hex8(val); print_debug("\r\n");
-#endif
 }
 
 static inline void print_initcpu8_nocr (const char *strval, unsigned val)
 {
-#if CONFIG_USE_PRINTK_IN_CAR
         printk_debug("%s%02x", strval, val);
-#else
-        print_debug(strval); print_debug_hex8(val);
-#endif
 }
 
 
 static inline void print_initcpu16 (const char *strval, unsigned val)
 {
-#if CONFIG_USE_PRINTK_IN_CAR
         printk_debug("%s%04x\r\n", strval, val);
-#else
-        print_debug(strval); print_debug_hex16(val); print_debug("\r\n");
-#endif
 }
 
 static inline void print_initcpu(const char *strval, unsigned val)
 {
-#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");
-#endif
 }
 
 typedef void (*process_ap_t)(unsigned apicid, void *gp);
@@ -171,14 +155,7 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned apicid);
 
 static inline __attribute__((always_inline)) void print_apicid_nodeid_coreid(unsigned apicid, struct node_core_id id, const char *str)
 {
-	#if CONFIG_USE_PRINTK_IN_CAR
                 printk_debug("%s --- {  APICID = %02x NODEID = %02x COREID = %02x} ---\r\n", str, apicid, id.nodeid, id.coreid);
-	#else
-		print_debug(str);
-        	print_debug(" ---- {APICID = "); print_debug_hex8(apicid);
-		print_debug(" NODEID = "), print_debug_hex8(id.nodeid); print_debug(" COREID = "), print_debug_hex8(id.coreid);
-	        print_debug("} --- \r\n");
-        #endif
 }