diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2012-11-13 14:52:04 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-16 01:13:10 +0100 |
| commit | fa2fc339c51649b106bf78703cbc17694abcee23 (patch) | |
| tree | 2060aa4f53a88cb2dd269a83f3f02e16f45ca00a /src/mainboard/supermicro/x6dhe_g | |
| parent | 55db955bcdad90c9ebd8b755ae417234d46d731a (diff) | |
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 <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1837
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/mainboard/supermicro/x6dhe_g')
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g/reset.c | 13 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g/romstage.c | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig index e8466be8a3..03bb0a8508 100644 --- a/src/mainboard/supermicro/x6dhe_g/Kconfig +++ b/src/mainboard/supermicro/x6dhe_g/Kconfig @@ -10,7 +10,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/x6dhe_g/reset.c b/src/mainboard/supermicro/x6dhe_g/reset.c deleted file mode 100644 index 1b1bc68d4b..0000000000 --- a/src/mainboard/supermicro/x6dhe_g/reset.c +++ /dev/null @@ -1,13 +0,0 @@ -#include <arch/io.h> -#include <reset.h> - -void soft_reset(void) -{ - outb(0x04, 0xcf9); -} - -void hard_reset(void) -{ - outb(0x02, 0xcf9); - outb(0x06, 0xcf9); -} diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c index f2578e5264..37fd2e43d7 100644 --- a/src/mainboard/supermicro/x6dhe_g/romstage.c +++ b/src/mainboard/supermicro/x6dhe_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/e7520/memory_initialized.c" #include "cpu/x86/bist.h" |