[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: remove PICASSO_LPC_IOMUX Kconfig option from SoC

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47891 )

Change subject: soc/amd/picasso: remove PICASSO_LPC_IOMUX Kconfig option from SoC
......................................................................

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 
---
M src/mainboard/amd/mandolin/Kconfig
M src/mainboard/amd/mandolin/Makefile.inc
M src/mainboard/amd/mandolin/mainboard.c
M src/soc/amd/picasso/Kconfig
4 files changed, 5 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/47891/1

diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index dde7ac8..0cc75f4 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -21,7 +21,7 @@
 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
@@ -93,7 +93,7 @@
 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 7787018..5ee5d44 100644
--- a/src/mainboard/amd/mandolin/Makefile.inc
+++ b/src/mainboard/amd/mandolin/Makefile.inc
@@ -5,10 +5,7 @@

ramstage-y += variants/$(VARIANT_DIR)/gpio.c
 ramstage-y += variants/$(VARIANT_DIR)/port_descriptors.c
-
-ifneq ($(CONFIG_PICASSO_LPC_IOMUX),y)
-ramstage-y += emmc_gpio.c
-endif
+ramstage-$(CONFIG_MANDOLIN_LPC) += emmc_gpio.c

ifeq ($(CONFIG_BOARD_AMD_MANDOLIN),y)
 APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_mandolin.bin
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index 247616c..b509282 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -111,13 +111,13 @@
 {
    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 c3995c8..7bcc316 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -376,12 +376,6 @@
    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