summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2020-11-23 23:01:45 +0100
committerFelix Held <felix-coreboot@felixheld.de>2020-11-30 19:17:29 +0000
commite2cb8696f0ea1522b256bcb3973c659c3cd76384 (patch)
tree8c56d24b1483236601670feabf94bd47f9ae5c03
parentffb4652461b4ee8da2b816c5288c3076b7379de4 (diff)
downloadcoreboot-e2cb8696f0ea1522b256bcb3973c659c3cd76384.tar.xz
soc/amd/picasso: remove PICASSO_LPC_IOMUX Kconfig option from SoC
PICASSO_LPC_IOMUX was only used in the amd/mandolin board, but not in the corresponding SoC code, so remove it from the SoC's Kconfig and reanme it in the mainboard's Kconfig to MANDOLIN_LPC. Change-Id: I261e093d6c56be6073a816b79c60d3a0457616f8 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47891 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
-rw-r--r--src/mainboard/amd/mandolin/Kconfig4
-rw-r--r--src/mainboard/amd/mandolin/Makefile.inc2
-rw-r--r--src/mainboard/amd/mandolin/mainboard.c4
-rw-r--r--src/soc/amd/picasso/Kconfig6
4 files changed, 5 insertions, 11 deletions
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index b779630d56..67766217e8 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -21,7 +21,7 @@ config FMDFILE
config AMD_LPC_DEBUG_CARD
bool "Enable LPC-Serial debug card on the debug header"
default n
- select PICASSO_LPC_IOMUX
+ select MANDOLIN_LPC
select SUPERIO_SMSC_SIO1036
help
AMD's debug card contains an SMSC SIO1036 device which provides an
@@ -111,7 +111,7 @@ config MANDOLIN_IOMUX_USE_EMMC
endchoice
endif # !AMD_LPC_DEBUG_CARD
-config PICASSO_LPC_IOMUX
+config MANDOLIN_LPC
bool
default y if MANDOLIN_IOMUX_USE_LPC
help
diff --git a/src/mainboard/amd/mandolin/Makefile.inc b/src/mainboard/amd/mandolin/Makefile.inc
index 778701834f..795a28fde2 100644
--- a/src/mainboard/amd/mandolin/Makefile.inc
+++ b/src/mainboard/amd/mandolin/Makefile.inc
@@ -6,7 +6,7 @@ bootblock-y += variants/$(VARIANT_DIR)/early_gpio.c
ramstage-y += variants/$(VARIANT_DIR)/gpio.c
ramstage-y += variants/$(VARIANT_DIR)/port_descriptors.c
-ifneq ($(CONFIG_PICASSO_LPC_IOMUX),y)
+ifneq ($(CONFIG_MANDOLIN_LPC),y)
ramstage-y += emmc_gpio.c
endif
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index 247616cff7..b509282f8b 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -111,13 +111,13 @@ static void mainboard_init(void *chip_info)
{
struct soc_amd_picasso_config *cfg = config_of_soc();
- if (!CONFIG(PICASSO_LPC_IOMUX))
+ if (!CONFIG(MANDOLIN_LPC))
cfg->emmc_config.timing = SD_EMMC_EMMC_HS400;
mainboard_program_gpios();
/* Re-muxing LPCCLK0 can hang the system if LPC is in use. */
- if (CONFIG(PICASSO_LPC_IOMUX))
+ if (CONFIG(MANDOLIN_LPC))
printk(BIOS_INFO, "eMMC not available due to LPC requirement\n");
else
mainboard_program_emmc_gpios();
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index c3995c87c7..7bcc316218 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -376,12 +376,6 @@ config DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ
int
default 150
-config PICASSO_LPC_IOMUX
- bool
- help
- Picasso's LPC bus signals are MUXed with some of the EMMC signals.
- Select this option if LPC signals are required.
-
config DISABLE_SPI_FLASH_ROM_SHARING
def_bool n
help