GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Felix Held 2020-11-23 23:01:45 +01:00
parent ffb4652461
commit e2cb8696f0
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/amd/mandolin/Kconfig
View File

@ -21,7 +21,7 @@ config FMDFILE
config AMD_LPC_DEBUG_CARD config AMD_LPC_DEBUG_CARD
bool "Enable LPC-Serial debug card on the debug header" bool "Enable LPC-Serial debug card on the debug header"
default n default n
select PICASSO_LPC_IOMUX select MANDOLIN_LPC
select SUPERIO_SMSC_SIO1036 select SUPERIO_SMSC_SIO1036
help help
AMD's debug card contains an SMSC SIO1036 device which provides an AMD's debug card contains an SMSC SIO1036 device which provides an
@ -111,7 +111,7 @@ config MANDOLIN_IOMUX_USE_EMMC
endchoice endchoice
endif # !AMD_LPC_DEBUG_CARD endif # !AMD_LPC_DEBUG_CARD
config PICASSO_LPC_IOMUX config MANDOLIN_LPC
bool bool
default y if MANDOLIN_IOMUX_USE_LPC default y if MANDOLIN_IOMUX_USE_LPC
help help

2
src/mainboard/amd/mandolin/Makefile.inc
View File

@ -6,7 +6,7 @@ bootblock-y += variants/$(VARIANT_DIR)/early_gpio.c
ramstage-y += variants/$(VARIANT_DIR)/gpio.c ramstage-y += variants/$(VARIANT_DIR)/gpio.c
ramstage-y += variants/$(VARIANT_DIR)/port_descriptors.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 ramstage-y += emmc_gpio.c
endif endif

4
src/mainboard/amd/mandolin/mainboard.c
View File

@ -111,13 +111,13 @@ static void mainboard_init(void *chip_info)
{ {
struct soc_amd_picasso_config *cfg = config_of_soc(); 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; cfg->emmc_config.timing = SD_EMMC_EMMC_HS400;
mainboard_program_gpios(); mainboard_program_gpios();
/* Re-muxing LPCCLK0 can hang the system if LPC is in use. */ /* 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"); printk(BIOS_INFO, "eMMC not available due to LPC requirement\n");
else else
mainboard_program_emmc_gpios(); mainboard_program_emmc_gpios();

6
src/soc/amd/picasso/Kconfig
View File

@ -376,12 +376,6 @@ config DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ
int int
default 150 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 config DISABLE_SPI_FLASH_ROM_SHARING
def_bool n def_bool n
help help