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/broadcom/bcm5785/Kconfig | 1 - src/southbridge/broadcom/bcm5785/early_setup.c | 2 +- src/southbridge/broadcom/bcm5785/reset.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/southbridge/broadcom/bcm5785') diff --git a/src/southbridge/broadcom/bcm5785/Kconfig b/src/southbridge/broadcom/bcm5785/Kconfig index d72afd8d2c..1ec4f8f692 100644 --- a/src/southbridge/broadcom/bcm5785/Kconfig +++ b/src/southbridge/broadcom/bcm5785/Kconfig @@ -1,6 +1,5 @@ config SOUTHBRIDGE_BROADCOM_BCM5785 bool - select HAVE_HARD_RESET config BOOTBLOCK_SOUTHBRIDGE_INIT string diff --git a/src/southbridge/broadcom/bcm5785/early_setup.c b/src/southbridge/broadcom/bcm5785/early_setup.c index 766aa1a468..c2aa9bcb47 100644 --- a/src/southbridge/broadcom/bcm5785/early_setup.c +++ b/src/southbridge/broadcom/bcm5785/early_setup.c @@ -103,7 +103,7 @@ void ldtstop_sb(void) } -void do_hard_reset(void) +void do_board_reset(void) { bcm5785_enable_wdt_port_cf9(); diff --git a/src/southbridge/broadcom/bcm5785/reset.c b/src/southbridge/broadcom/bcm5785/reset.c index 1041aae301..ad3ea8f5ba 100644 --- a/src/southbridge/broadcom/bcm5785/reset.c +++ b/src/southbridge/broadcom/bcm5785/reset.c @@ -21,7 +21,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