summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-04-29 07:15:26 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-04-29 17:31:40 +0200
commitbb6c2162d17bf6acf0ba874c12f5dc7cf3cdde05 (patch)
tree6c27c2f065990fc15936468abaa18b6eee266a7b
parent88e518f4bca789c81c866bddbce3f6e0015d7ad3 (diff)
downloadcoreboot-bb6c2162d17bf6acf0ba874c12f5dc7cf3cdde05.tar.xz
AGESA SPI: Fix Kconfig options
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 <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5606 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Idwer Vollering <vidwer@gmail.com>
-rw-r--r--src/cpu/amd/agesa/Kconfig1
-rw-r--r--src/southbridge/amd/Kconfig8
-rw-r--r--src/southbridge/amd/agesa/hudson/Kconfig1
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