From 77330e5b153cba121cf246e6643bf659d16d0a77 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 19 Feb 2021 11:01:33 +0100 Subject: mb/amd/padmelon: Replace `HAVE_S3_SUPPORT` symbol Replace it with `HAVE_ACPI_RESUME`, which defaults to n for this board. Change-Id: Ibb07c0d001ded8d7ff991bf63607872bf4b79c8e Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/50904 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Marshall Dawson --- src/mainboard/amd/padmelon/Kconfig | 4 ---- src/mainboard/amd/padmelon/gpio.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig index 48df9ca7a4..aedb1b40a2 100644 --- a/src/mainboard/amd/padmelon/Kconfig +++ b/src/mainboard/amd/padmelon/Kconfig @@ -44,10 +44,6 @@ config PADMELON_SOC_IN_USE select AMD_APU_MERLINFALCON if PADMELON_MERLIN_FALCON select AMD_APU_PRAIRIEFALCON if PADMELON_PRAIRIE_FALCON -config HAVE_S3_SUPPORT - bool - default n - config MAX_CPUS int default 4 diff --git a/src/mainboard/amd/padmelon/gpio.c b/src/mainboard/amd/padmelon/gpio.c index 7897d7bc9d..228da50b3b 100644 --- a/src/mainboard/amd/padmelon/gpio.c +++ b/src/mainboard/amd/padmelon/gpio.c @@ -20,7 +20,7 @@ static const struct soc_amd_gpio gpio_set_stage_reset[] = { }; static const struct soc_amd_gpio gpio_set_stage_ram[] = { -#if CONFIG(HAVE_S3_SUPPORT) +#if CONFIG(HAVE_ACPI_RESUME) /* PCIE_WAKE - default, do not program */ /* DEVSLP1 */ @@ -34,7 +34,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { /* WLAND - default as GPIO, do not program */ -#endif /* HAVE_S3_SUPPORT */ +#endif /* HAVE_ACPI_RESUME */ /* BLINK - reselect GPIO OUTPUT HIGH to force BLINK */ PAD_GPO(GPIO_11, HIGH), }; -- cgit v1.2.3