From e20dd19dde6ab887a71b084fa342a8c46488568e Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 7 Oct 2018 12:12:27 +0200 Subject: amdfam10: Convert to `board_reset()` And here comes the mess... This just renames do_hard_reset() to do_board_reset() and keeps current behaviour. As these are never called from chipset or board code but only from common code, it's likely that their implementations are untested and not what we actually want. Also note, that sometimes implementations for rom- and ramstage differ considerably. Change-Id: Icdf55ed1a0e0294933f61749a37da2ced01da61c Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/29058 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/southbridge/nvidia/mcp55/Kconfig | 1 - src/southbridge/nvidia/mcp55/early_ctrl.c | 2 +- src/southbridge/nvidia/mcp55/reset.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/southbridge/nvidia/mcp55') diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig index 89aa45258a..bb1b7df672 100644 --- a/src/southbridge/nvidia/mcp55/Kconfig +++ b/src/southbridge/nvidia/mcp55/Kconfig @@ -2,7 +2,6 @@ config SOUTHBRIDGE_NVIDIA_MCP55 bool select HAVE_USBDEBUG select IOAPIC - select HAVE_HARD_RESET if SOUTHBRIDGE_NVIDIA_MCP55 diff --git a/src/southbridge/nvidia/mcp55/early_ctrl.c b/src/southbridge/nvidia/mcp55/early_ctrl.c index e91abdff8d..66ceae29e0 100644 --- a/src/southbridge/nvidia/mcp55/early_ctrl.c +++ b/src/southbridge/nvidia/mcp55/early_ctrl.c @@ -29,7 +29,7 @@ void do_soft_reset(void) outb(0x06, 0x0cf9); } -void do_hard_reset(void) +void do_board_reset(void) { set_bios_reset(); diff --git a/src/southbridge/nvidia/mcp55/reset.c b/src/southbridge/nvidia/mcp55/reset.c index 7be98d7a2f..d6f7f6f337 100644 --- a/src/southbridge/nvidia/mcp55/reset.c +++ b/src/southbridge/nvidia/mcp55/reset.c @@ -24,7 +24,7 @@ #include "../../../northbridge/amd/amdk8/reset_test.c" -void do_hard_reset(void) +void do_board_reset(void) { set_bios_reset(); /* Try rebooting through port 0xcf9 */ -- cgit v1.2.3