summaryrefslogtreecommitdiff
path: root/src/mainboard/tyan/s2735
diff options
context:
space:
mode:
author- supermicro/x6dhe_g/auto.c <- supermicro/x6dhe_g/auto.c>2009-10-24 19:17:24 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-10-24 19:17:24 +0000
commitd1327ce9639645f84024ddd66d2b11f57619d8e6 (patch)
tree3cc499edbe6fc9a91235f466514f34485bfd68b3 /src/mainboard/tyan/s2735
parent8d2ddff011700744d2374a95f8c807dbdfb85603 (diff)
downloadcoreboot-d1327ce9639645f84024ddd66d2b11f57619d8e6.tar.xz
Major cleanups of the hard_reset() code and config in coreboot.
- Drop unused "#object reset.o" entries. - Use CONFIG_HAVE_HARD_RESET for all "object reset.o" entries. - Drop dead/commented code, i.e. useless hard_reset() from: - supermicro/x6dhe_g/auto.c - supermicro/x6dhe_g2/auto.c - supermicro/x6dhe_g2/auto.updated.c - supermicro/x6dhr_ig/auto.c - supermicro/x6dhr_ig2/auto.c - digitallogic/msm586seg/auto.c - dell/s1850/auto.c - Add "obj-$(CONFIG_HAVE_HARD_RESET) += reset.o" to kconfig files of boards that actually have a reset.c file. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4849 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/tyan/s2735')
-rw-r--r--src/mainboard/tyan/s2735/Config.lb2
-rw-r--r--src/mainboard/tyan/s2735/Makefile.inc1
-rw-r--r--src/mainboard/tyan/s2735/cache_as_ram_auto.c1
-rw-r--r--src/mainboard/tyan/s2735/reset.c1
4 files changed, 4 insertions, 1 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();