From bb6c2162d17bf6acf0ba874c12f5dc7cf3cdde05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 29 Apr 2014 07:15:26 +0300 Subject: [PATCH] AGESA SPI: Fix Kconfig options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Option AMD_SB_SPI_LEN leaked to non-AMD configs. Option SPI_FLASH is compulsory with HAVE_ACPI_RESUME. Change-Id: Ib84c4d9e4fdf670b32b0cae7280fcbb6d3aecaf5 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5606 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Edward O'Callaghan Reviewed-by: Idwer Vollering --- src/cpu/amd/agesa/Kconfig | 1 + src/southbridge/amd/Kconfig | 8 +++++--- src/southbridge/amd/agesa/hudson/Kconfig | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig index a73c5cef3a..15ed8610fc 100644 --- a/src/cpu/amd/agesa/Kconfig +++ b/src/cpu/amd/agesa/Kconfig @@ -29,6 +29,7 @@ config CPU_AMD_AGESA select TSC_SYNC_LFENCE select UDELAY_LAPIC select LAPIC_MONOTONIC_TIMER + select SPI_FLASH if HAVE_ACPI_RESUME if CPU_AMD_AGESA diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig index 42209ce7b2..39aeb09455 100644 --- a/src/southbridge/amd/Kconfig +++ b/src/southbridge/amd/Kconfig @@ -15,9 +15,11 @@ source src/southbridge/amd/cimx/Kconfig source src/southbridge/amd/agesa/Kconfig source src/southbridge/amd/sr5650/Kconfig -config SPI_FLASH - bool - default y if HAVE_ACPI_RESUME && CPU_AMD_AGESA +if CPU_AMD_AGESA + config AMD_SB_SPI_TX_LEN int default 4 + depends on SPI_FLASH + +endif diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig index dd5120dbf7..9e21b849fe 100644 --- a/src/southbridge/amd/agesa/hudson/Kconfig +++ b/src/southbridge/amd/agesa/hudson/Kconfig @@ -243,6 +243,7 @@ if SOUTHBRIDGE_AMD_AGESA_YANGTZE config AMD_SB_SPI_TX_LEN int default 64 + depends on SPI_FLASH config AZ_PIN hex