Index: coreboot-v2/src/cpu/intel/model_6ex/cache_as_ram_disable.c
===================================================================
--- coreboot-v2.orig/src/cpu/intel/model_6ex/cache_as_ram_disable.c
+++ coreboot-v2/src/cpu/intel/model_6ex/cache_as_ram_disable.c
@@ -102,6 +102,11 @@ cpu_reset_x:
 			:"=a" (new_cpu_reset)
 		);
 
+#ifdef CONFIG_DEACTIVATE_CAR
+		print_debug("Deactivating CAR");
+#include CONFIG_DEACTIVATE_CAR_FILE
+		print_debug(" - Done.\r\n");
+#endif
 		/* Copy and execute coreboot_ram */
 		copy_and_run(new_cpu_reset);
 		/* We will not return */
Index: coreboot-v2/src/cpu/intel/model_6fx/cache_as_ram_disable.c
===================================================================
--- coreboot-v2.orig/src/cpu/intel/model_6fx/cache_as_ram_disable.c
+++ coreboot-v2/src/cpu/intel/model_6fx/cache_as_ram_disable.c
@@ -102,6 +102,11 @@ cpu_reset_x:
 			:"=a" (new_cpu_reset)
 		);
 
+#ifdef CONFIG_DEACTIVATE_CAR
+		print_debug("Deactivating CAR");
+#include CONFIG_DEACTIVATE_CAR_FILE
+		print_debug(" - Done.\r\n");
+#endif
 		/* Copy and execute coreboot_ram */
 		copy_and_run(new_cpu_reset);
 		/* We will not return */
Index: coreboot-v2/src/cpu/x86/car/copy_and_run.c
===================================================================
--- coreboot-v2.orig/src/cpu/x86/car/copy_and_run.c
+++ coreboot-v2/src/cpu/x86/car/copy_and_run.c
@@ -45,11 +45,6 @@ static void copy_and_run(unsigned cpu_re
 #else
 	print_spew("coreboot_ram.bin length = "); print_spew_hex32(olen); print_spew("\r\n");
 #endif
-#ifdef CONFIG_DEACTIVATE_CAR
-	print_debug("Deactivating CAR");
-#include CONFIG_DEACTIVATE_CAR_FILE
-	print_debug(" - Done.\r\n");
-#endif
 	print_debug("Jumping to coreboot.\r\n");
 
 	if(cpu_reset == 1 ) {
Index: coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c
===================================================================
--- coreboot-v2.orig/src/mainboard/tyan/s2735/cache_as_ram_auto.c
+++ coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c
@@ -256,6 +256,11 @@ cpu_reset_x:
                 print_debug("new_cpu_reset = "); print_debug_hex32(new_cpu_reset); print_debug("\r\n");
 #endif
 	
+#ifdef CONFIG_DEACTIVATE_CAR
+		print_debug("Deactivating CAR");
+#include CONFIG_DEACTIVATE_CAR_FILE
+		print_debug(" - Done.\r\n");
+#endif
 		/*copy and execute coreboot_ram */
 		copy_and_run(new_cpu_reset);
 		/* We will not return */
Index: coreboot-v2/src/mainboard/via/vt8454c/auto.c
===================================================================
--- coreboot-v2.orig/src/mainboard/via/vt8454c/auto.c
+++ coreboot-v2/src/mainboard/via/vt8454c/auto.c
@@ -119,6 +119,12 @@ static void main(unsigned long bist)
 	sdram_set_registers(cx700);
 	enable_shadow_ram(cx700);
 	sdram_enable(cx700);
+
+#ifdef CONFIG_DEACTIVATE_CAR
+	print_debug("Deactivating CAR");
+#include CONFIG_DEACTIVATE_CAR_FILE
+	print_debug(" - Done.\r\n");
+#endif
 	copy_and_run(0);
 }
 
