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/amd/amd8111/Kconfig | 1 - src/southbridge/amd/amd8111/early_ctrl.c | 2 +- src/southbridge/amd/amd8111/reset.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/southbridge/amd/amd8111') diff --git a/src/southbridge/amd/amd8111/Kconfig b/src/southbridge/amd/amd8111/Kconfig index 5541c93418..1436d8cc83 100644 --- a/src/southbridge/amd/amd8111/Kconfig +++ b/src/southbridge/amd/amd8111/Kconfig @@ -16,7 +16,6 @@ config SOUTHBRIDGE_AMD_AMD8111 bool select IOAPIC - select HAVE_HARD_RESET config BOOTBLOCK_SOUTHBRIDGE_INIT string diff --git a/src/southbridge/amd/amd8111/early_ctrl.c b/src/southbridge/amd/amd8111/early_ctrl.c index f3ba8b6704..aa323e45a0 100644 --- a/src/southbridge/amd/amd8111/early_ctrl.c +++ b/src/southbridge/amd/amd8111/early_ctrl.c @@ -52,7 +52,7 @@ static void enable_cf9(void) enable_cf9_x(sbbusn, sbdn); } -void do_hard_reset(void) +void do_board_reset(void) { set_bios_reset(); /* reset */ diff --git a/src/southbridge/amd/amd8111/reset.c b/src/southbridge/amd/amd8111/reset.c index fea8891a98..41d9880f59 100644 --- a/src/southbridge/amd/amd8111/reset.c +++ b/src/southbridge/amd/amd8111/reset.c @@ -37,7 +37,7 @@ static pci_devfn_t pci_io_locate_device_on_bus(unsigned pci_id, unsigned bus) #include "../../../northbridge/amd/amdk8/reset_test.c" -void do_hard_reset(void) +void do_board_reset(void) { pci_devfn_t dev; unsigned bus; -- cgit v1.2.3