From bc6a690455923821c3da79e6b18606b288927b04 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 9 Nov 2023 14:08:53 +0100 Subject: device/Kconfig: rename AZALIA_PLUGIN_SUPPORT to AZALIA_HDA_CODEC_SUPPORT Rename AZALIA_PLUGIN_SUPPORT to AZALIA_HDA_CODEC_SUPPORT and add a help text to this Kconfig option to clarify what this option is about. Signed-off-by: Felix Held Change-Id: I71e36869c6ebf77f43ca78f5e451aebfb59f1c74 Reviewed-on: https://review.coreboot.org/c/coreboot/+/78986 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Nico Huber --- src/device/Kconfig | 9 +++++++-- src/device/Makefile.inc | 4 ++-- src/mainboard/amd/bilby/Kconfig | 2 +- src/mainboard/amd/mandolin/Kconfig | 2 +- src/mainboard/amd/pademelon/Kconfig | 2 +- src/soc/amd/common/block/hda/hda.c | 2 +- src/soc/intel/broadwell/pch/Kconfig | 2 +- src/soc/intel/common/Kconfig.common | 2 +- src/southbridge/intel/bd82x6x/Kconfig | 2 +- src/southbridge/intel/i82801gx/Kconfig | 2 +- src/southbridge/intel/i82801ix/Kconfig | 2 +- src/southbridge/intel/i82801jx/Kconfig | 2 +- src/southbridge/intel/ibexpeak/Kconfig | 2 +- src/southbridge/intel/lynxpoint/Kconfig | 2 +- 14 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/device/Kconfig b/src/device/Kconfig index 8c6c734ad9bb..13d20cdcee2c 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -564,13 +564,18 @@ config CARDBUS_PLUGIN_SUPPORT bool default y -config AZALIA_PLUGIN_SUPPORT +config AZALIA_HDA_CODEC_SUPPORT bool default n + help + Select this option to include the code to initialize Azalia HD audio + codec chips. This will also add the hda_verb.c file from the + mainboard directory to the build which contain the board-specific HD + audio codec configuration. config AZALIA_LOCK_DOWN_R_WO_GCAP def_bool n - depends on AZALIA_PLUGIN_SUPPORT + depends on AZALIA_HDA_CODEC_SUPPORT help The GCAP register is implemented as R/WO (Read / Write Once) on some HD Audio controllers, such as Intel 6-series PCHs. Select this option diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc index 6a2d964a67fa..a2f0d3ec3ade 100644 --- a/src/device/Makefile.inc +++ b/src/device/Makefile.inc @@ -4,12 +4,12 @@ ramstage-y += device.c ramstage-y += root_device.c ramstage-y += cpu_device.c ramstage-y += device_util.c -ramstage-$(CONFIG_AZALIA_PLUGIN_SUPPORT) += azalia_device.c +ramstage-$(CONFIG_AZALIA_HDA_CODEC_SUPPORT) += azalia_device.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += pnp_device.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_64) += pnp_device.c ramstage-y += smbus_ops.c -ifeq ($(CONFIG_AZALIA_PLUGIN_SUPPORT),y) +ifeq ($(CONFIG_AZALIA_HDA_CODEC_SUPPORT),y) ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/hda_verb.c) endif diff --git a/src/mainboard/amd/bilby/Kconfig b/src/mainboard/amd/bilby/Kconfig index 34c7f90e6c54..19fcbe5e9fd7 100644 --- a/src/mainboard/amd/bilby/Kconfig +++ b/src/mainboard/amd/bilby/Kconfig @@ -6,7 +6,7 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_AMD_PICASSO select BOARD_ROMSIZE_KB_16384 - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select HAVE_ACPI_RESUME select DRIVERS_UART_ACPI select AMD_SOC_CONSOLE_UART if !AMD_LPC_DEBUG_CARD diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig index 20ff1c6d3877..252404bb5376 100644 --- a/src/mainboard/amd/mandolin/Kconfig +++ b/src/mainboard/amd/mandolin/Kconfig @@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS select SOC_AMD_PICASSO select BOARD_ROMSIZE_KB_8192 if BOARD_AMD_MANDOLIN select BOARD_ROMSIZE_KB_16384 if BOARD_AMD_CEREME - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select HAVE_ACPI_RESUME select DRIVERS_UART_ACPI select AMD_SOC_CONSOLE_UART if !AMD_LPC_DEBUG_CARD diff --git a/src/mainboard/amd/pademelon/Kconfig b/src/mainboard/amd/pademelon/Kconfig index 9890d7f61cc4..b31971d95e61 100644 --- a/src/mainboard/amd/pademelon/Kconfig +++ b/src/mainboard/amd/pademelon/Kconfig @@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS select SUPERIO_FINTEK_COMMON_PRE_RAM select SUPERIO_FINTEK_FAN_CONTROL select SUPERIO_FINTEK_FAN_API_CALL - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT config MAINBOARD_DIR default "amd/pademelon" diff --git a/src/soc/amd/common/block/hda/hda.c b/src/soc/amd/common/block/hda/hda.c index 4e1c409d4815..8bc0abd9f445 100644 --- a/src/soc/amd/common/block/hda/hda.c +++ b/src/soc/amd/common/block/hda/hda.c @@ -29,7 +29,7 @@ static struct device_operations hda_audio_ops = { }; static const struct pci_driver hdaaudio_driver __pci_driver = { - .ops = CONFIG(AZALIA_PLUGIN_SUPPORT) ? + .ops = CONFIG(AZALIA_HDA_CODEC_SUPPORT) ? &default_azalia_audio_ops : &hda_audio_ops, .vendor = PCI_VID_AMD, .devices = pci_device_ids, diff --git a/src/soc/intel/broadwell/pch/Kconfig b/src/soc/intel/broadwell/pch/Kconfig index 8704b89294fe..310d58a08369 100644 --- a/src/soc/intel/broadwell/pch/Kconfig +++ b/src/soc/intel/broadwell/pch/Kconfig @@ -4,7 +4,7 @@ config INTEL_LYNXPOINT_LP select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_SOC_NVS - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select BOOT_DEVICE_SUPPORTS_WRITES select HAVE_EM100PRO_SPI_CONSOLE_SUPPORT select HAVE_POWER_STATE_AFTER_FAILURE diff --git a/src/soc/intel/common/Kconfig.common b/src/soc/intel/common/Kconfig.common index ed6068da54fe..2ccd39508cc2 100644 --- a/src/soc/intel/common/Kconfig.common +++ b/src/soc/intel/common/Kconfig.common @@ -38,7 +38,7 @@ endif config SOC_INTEL_COMMON bool - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select ACPI_SOC_NVS help common code for Intel SOCs diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig index 5ba913dac543..41732bd0f2f1 100644 --- a/src/southbridge/intel/bd82x6x/Kconfig +++ b/src/southbridge/intel/bd82x6x/Kconfig @@ -14,7 +14,7 @@ config SOUTH_BRIDGE_OPTIONS select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_SOC_NVS - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select SOUTHBRIDGE_INTEL_COMMON_FINALIZE select SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ select SOUTHBRIDGE_INTEL_COMMON_SMBUS diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig index 2467e3979159..757e5bf35653 100644 --- a/src/southbridge/intel/i82801gx/Kconfig +++ b/src/southbridge/intel/i82801gx/Kconfig @@ -6,7 +6,7 @@ config SOUTHBRIDGE_INTEL_I82801GX select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_SOC_NVS - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select USE_WATCHDOG_ON_BOOT select HAVE_SMI_HANDLER select SOUTHBRIDGE_INTEL_COMMON_GPIO diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig index fb33474de26d..21bc02b82772 100644 --- a/src/southbridge/intel/i82801ix/Kconfig +++ b/src/southbridge/intel/i82801ix/Kconfig @@ -6,7 +6,7 @@ config SOUTHBRIDGE_INTEL_I82801IX select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_SOC_NVS - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select HAVE_SMI_HANDLER if !NO_SMM select HAVE_USBDEBUG_OPTIONS select INTEL_DESCRIPTOR_MODE_CAPABLE diff --git a/src/southbridge/intel/i82801jx/Kconfig b/src/southbridge/intel/i82801jx/Kconfig index 3f0ab1015274..1a6b883c30e0 100644 --- a/src/southbridge/intel/i82801jx/Kconfig +++ b/src/southbridge/intel/i82801jx/Kconfig @@ -5,7 +5,7 @@ config SOUTHBRIDGE_INTEL_I82801JX select ACPI_COMMON_MADT_IOAPIC select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select HAVE_POWER_STATE_AFTER_FAILURE select HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE select HAVE_SMI_HANDLER diff --git a/src/southbridge/intel/ibexpeak/Kconfig b/src/southbridge/intel/ibexpeak/Kconfig index 8db7af7a539a..4378723287cf 100644 --- a/src/southbridge/intel/ibexpeak/Kconfig +++ b/src/southbridge/intel/ibexpeak/Kconfig @@ -5,7 +5,7 @@ config SOUTHBRIDGE_INTEL_IBEXPEAK select ACPI_COMMON_MADT_IOAPIC select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select HAVE_SMI_HANDLER select USE_WATCHDOG_ON_BOOT select PCIEXP_ASPM diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig index 2d5b3822d056..48492e66924a 100644 --- a/src/southbridge/intel/lynxpoint/Kconfig +++ b/src/southbridge/intel/lynxpoint/Kconfig @@ -6,7 +6,7 @@ config SOUTHBRIDGE_INTEL_LYNXPOINT select ACPI_COMMON_MADT_LAPIC select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_SOC_NVS - select AZALIA_PLUGIN_SUPPORT + select AZALIA_HDA_CODEC_SUPPORT select SOUTHBRIDGE_INTEL_COMMON_SMBUS select SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS select SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 -- cgit v1.2.3