9 files changed, 4 insertions, 6 deletions
diff --git a/src/mainboard/tyan/s2735/Config.lb b/src/mainboard/tyan/s2735/Config.lb
index c15d0917a3..ae5de634e8 100644
--- a/src/mainboard/tyan/s2735/Config.lb
+++ b/src/mainboard/tyan/s2735/Config.lb
@@ -12,7 +12,7 @@ arch i386 end
 driver mainboard.o
 if CONFIG_GENERATE_MP_TABLE object mptable.o end
 if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
-object reset.o
+if CONFIG_HAVE_HARD_RESET object reset.o end
 if CONFIG_USE_INIT
 
 makerule ./auto.o
diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc
index 3b05dac815..40b008effb 100644
--- a/src/mainboard/tyan/s2735/Makefile.inc
+++ b/src/mainboard/tyan/s2735/Makefile.inc
@@ -27,6 +27,7 @@ driver-y +=  mainboard.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 
 #driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 
diff --git a/src/mainboard/tyan/s2735/cache_as_ram_auto.c b/src/mainboard/tyan/s2735/cache_as_ram_auto.c
index 31856fec39..8656d3dd5d 100644
--- a/src/mainboard/tyan/s2735/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2735/cache_as_ram_auto.c
@@ -37,6 +37,7 @@ static void post_code(uint8_t value) {
 
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
+// FIXME: There's another hard_reset() in reset.c. Why?
 static void hard_reset(void)
 {
         /* full reset */
diff --git a/src/mainboard/tyan/s2735/reset.c b/src/mainboard/tyan/s2735/reset.c
index 4b2ab0daae..bffb0389a8 100644
--- a/src/mainboard/tyan/s2735/reset.c
+++ b/src/mainboard/tyan/s2735/reset.c
@@ -1,5 +1,6 @@
 void i82801er_hard_reset(void);
 
+/* FIXME: There's another hard_reset() in cache_as_ram_auto.c. Why? */
 void hard_reset(void)
 {
 	i82801er_hard_reset();
diff --git a/src/mainboard/tyan/s2891/Config.lb b/src/mainboard/tyan/s2891/Config.lb
index 3f051a0da4..53da12bcaf 100644
--- a/src/mainboard/tyan/s2891/Config.lb
+++ b/src/mainboard/tyan/s2891/Config.lb
@@ -18,7 +18,6 @@ object get_bus_conf.o
 
 if CONFIG_GENERATE_MP_TABLE object mptable.o end
 if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
 
 if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
diff --git a/src/mainboard/tyan/s2892/Config.lb b/src/mainboard/tyan/s2892/Config.lb
index 9dcb7dae55..35328e5446 100644
--- a/src/mainboard/tyan/s2892/Config.lb
+++ b/src/mainboard/tyan/s2892/Config.lb
@@ -19,7 +19,6 @@ object get_bus_conf.o
 
 if CONFIG_GENERATE_MP_TABLE object mptable.o end
 if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
 
 if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
diff --git a/src/mainboard/tyan/s2895/Config.lb b/src/mainboard/tyan/s2895/Config.lb
index c4f24f4e8d..e4946de971 100644
--- a/src/mainboard/tyan/s2895/Config.lb
+++ b/src/mainboard/tyan/s2895/Config.lb
@@ -14,7 +14,6 @@ object get_bus_conf.o
 
 if CONFIG_GENERATE_MP_TABLE object mptable.o end
 if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
 
 if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
diff --git a/src/mainboard/tyan/s2912/Config.lb b/src/mainboard/tyan/s2912/Config.lb
index a52a70b235..08f824b347 100644
--- a/src/mainboard/tyan/s2912/Config.lb
+++ b/src/mainboard/tyan/s2912/Config.lb
@@ -35,7 +35,6 @@ object get_bus_conf.o
 
 if CONFIG_GENERATE_MP_TABLE object mptable.o end
 if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
 
 	if CONFIG_USE_INIT
 		makerule ./cache_as_ram_auto.o
diff --git a/src/mainboard/tyan/s2912_fam10/Config.lb b/src/mainboard/tyan/s2912_fam10/Config.lb
index 84f6d1cde5..799931c521 100644
--- a/src/mainboard/tyan/s2912_fam10/Config.lb
+++ b/src/mainboard/tyan/s2912_fam10/Config.lb
@@ -35,7 +35,6 @@ object get_bus_conf.o
 
 if CONFIG_GENERATE_MP_TABLE object mptable.o end
 if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
 
 	if CONFIG_USE_INIT
 		makerule ./cache_as_ram_auto.o