From fa2fc339c51649b106bf78703cbc17694abcee23 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 13 Nov 2012 14:52:04 -0800 Subject: Drop Kconfig variable BOARD_HAS_HARD_RESET hard_reset was indeed consolidated and moved into the southbridge code a while ago, but the config variable was still kept alife, with some duplicate code. Change-Id: I60d4a87de916667f6e89353dfbe1a7b9eca380f7 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/1837 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/supermicro/x6dai_g/Kconfig | 1 - src/mainboard/supermicro/x6dai_g/reset.c | 12 ------------ src/mainboard/supermicro/x6dai_g/romstage.c | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 src/mainboard/supermicro/x6dai_g/reset.c (limited to 'src/mainboard/supermicro/x6dai_g') diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig index bac1008a1a..90a800cee0 100644 --- a/src/mainboard/supermicro/x6dai_g/Kconfig +++ b/src/mainboard/supermicro/x6dai_g/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SUPERIO_WINBOND_W83627HF select ROMCC select HAVE_HARD_RESET - select BOARD_HAS_HARD_RESET select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/supermicro/x6dai_g/reset.c b/src/mainboard/supermicro/x6dai_g/reset.c deleted file mode 100644 index 2f21605e7c..0000000000 --- a/src/mainboard/supermicro/x6dai_g/reset.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include - -void soft_reset(void) -{ - outb(0x04, 0xcf9); -} -void hard_reset(void) -{ - outb(0x02, 0xcf9); - outb(0x06, 0xcf9); -} diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c index 479e24c5ae..dda5817335 100644 --- a/src/mainboard/supermicro/x6dai_g/romstage.c +++ b/src/mainboard/supermicro/x6dai_g/romstage.c @@ -15,7 +15,7 @@ #include "cpu/x86/mtrr/earlymtrr.c" #include "debug.c" #include "watchdog.c" -#include "reset.c" +#include "southbridge/intel/esb6300/reset.c" #include "superio/winbond/w83627hf/early_serial.c" #include "northbridge/intel/e7525/memory_initialized.c" #include "cpu/x86/bist.h" -- cgit v1.2.3