summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2021-02-17 00:32:46 +0100
committerFelix Held <felix-coreboot@felixheld.de>2021-02-18 01:17:19 +0000
commita2642d0ffe3ecba201a0bfe6b219e35b52c399ae (patch)
treeeab9680b156202134e0ad322c64970b32877722b
parentb284013065aff4f20890b0422444c9022cb54e7c (diff)
Revert "soc/amd: Add option to select if SOC supports ESPI sub decode"
This reverts commit 64d0ad347b5c9c698547f0ff15779e88a10014f4. In the current revision 3.001 of the PPR #56569 the register exists and the bit definitions match. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Ie7a97843c3dac897f79f229b660b7e30b34eef93 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50824 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
-rw-r--r--src/soc/amd/common/block/lpc/Kconfig4
-rw-r--r--src/soc/amd/common/block/lpc/espi_util.c3
-rw-r--r--src/soc/amd/picasso/Kconfig1
3 files changed, 1 insertions, 7 deletions
diff --git a/src/soc/amd/common/block/lpc/Kconfig b/src/soc/amd/common/block/lpc/Kconfig
index 6ea34fba19..bbc1650f24 100644
--- a/src/soc/amd/common/block/lpc/Kconfig
+++ b/src/soc/amd/common/block/lpc/Kconfig
@@ -20,7 +20,3 @@ config SOC_AMD_COMMON_BLOCK_USE_ESPI
help
Select this option if mainboard uses eSPI instead of LPC (if supported
by platform).
-
-config SOC_AMD_COMMON_BLOCK_HAS_ESPI_SUB_DECODE
- bool
- depends on SOC_AMD_COMMON_BLOCK_HAS_ESPI
diff --git a/src/soc/amd/common/block/lpc/espi_util.c b/src/soc/amd/common/block/lpc/espi_util.c
index 7ee53862dc..0878fb7663 100644
--- a/src/soc/amd/common/block/lpc/espi_util.c
+++ b/src/soc/amd/common/block/lpc/espi_util.c
@@ -916,8 +916,7 @@ int espi_setup(void)
}
/* Enable subtractive decode if configured */
- if (CONFIG(SOC_AMD_COMMON_BLOCK_HAS_ESPI_SUB_DECODE))
- espi_setup_subtractive_decode(cfg);
+ espi_setup_subtractive_decode(cfg);
return 0;
}
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index bcf28d81bd..dba95b62e5 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -32,7 +32,6 @@ config CPU_SPECIFIC_OPTIONS
select SOC_AMD_COMMON_BLOCK_DATA_FABRIC
select SOC_AMD_COMMON_BLOCK_GRAPHICS
select SOC_AMD_COMMON_BLOCK_HAS_ESPI
- select SOC_AMD_COMMON_BLOCK_HAS_ESPI_SUB_DECODE
select SOC_AMD_COMMON_BLOCK_HDA
select SOC_AMD_COMMON_BLOCK_IOMMU
select SOC_AMD_COMMON_BLOCK_LPC