--- src/mainboard/tyan/s2892/cache_as_ram_auto.c	2006-10-18 13:16:53.000000000 -0500
+++ src/mainboard/tyan/s2892/cache_as_ram_auto.c.new	2006-10-18 13:17:35.000000000 -0500
@@ -86,7 +86,7 @@
 #include "cpu/amd/model_fxx/init_cpus.c"
 
 
-#if USE_FALLBACK_IMAGE == 1
+#if HAVE_FALLBACK_BOOT == 1
 
 #include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
@@ -114,11 +114,15 @@
 
         /* Is this a cpu only reset? or Is this a secondary cpu? */
         if ((cpu_init_detectedx) || (!boot_cpu())) {
+#if USE_FALLBACK_IMAGE == 0
                 if (last_boot_normal_x) {
                         goto normal_image;
                 } else {
                         goto fallback_image;
                 }
+#else 
+		goto fallback_image;
+#endif 
         }
 
         /* Nothing special needs to be done to find bus 0 */
@@ -133,11 +137,19 @@
 
         /* Is this a deliberate reset by the bios */
         if (bios_reset_detected() && last_boot_normal_x) {
+#if USE_FALLBACK_IMAGE == 0
                 goto normal_image;
+#else 
+		goto fallback_image;
+#endif 
         }
         /* This is the primary cpu how should I boot? */
         else if (do_normal_boot()) {
+#if USE_FALLBACK_IMAGE == 0
                 goto normal_image;
+#else 
+		goto fallback_image;
+#endif 
         }
         else {
                 goto fallback_image;
@@ -151,7 +163,7 @@
  fallback_image:
 	;
 }
-#endif // USE_FALLBACK_IMAGE == 0
+#endif // HAVE_FALLBACK_BOOT == 1
 
 void real_main(unsigned long bist, unsigned long cpu_init_detectedx);