[linux-yocto] [PATCH 1/1] intel bsp .cfg files: remove redundant sound configs

nitin.a.kamble at intel.com nitin.a.kamble at intel.com
Thu May 8 13:49:49 PDT 2014


From: Nitin A Kamble <nitin.a.kamble at intel.com>

The sound configs are defined in features/sound/snd_hda_intel.cfg.
If some of these configs are defined differently like kernel builtin
instead of modules, then it changes the timing of driver loading causing
audio breakages for some of the BSPs.

This commit fixes the audio issues with some of the Intel BSPs
with the v3.14 kernel.

Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
---
 meta/cfg/kernel-cache/bsp/common-pc-64/hardware.cfg       | 1 -
 meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg | 5 -----
 meta/cfg/kernel-cache/bsp/common-pc/hardware.cfg          | 1 -
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg           | 3 ---
 meta/cfg/kernel-cache/bsp/crystalforest/crystalforest.cfg | 3 ---
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg             | 3 ---
 meta/cfg/kernel-cache/bsp/emenlow/hardware.cfg            | 1 -
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg                   | 3 ---
 meta/cfg/kernel-cache/bsp/haswell-wc/haswell-wc.cfg       | 4 ----
 meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.cfg   | 3 ---
 meta/cfg/kernel-cache/bsp/minnow/minnow.cfg               | 3 ---
 meta/cfg/kernel-cache/bsp/rangeley/rangeley.cfg           | 3 ---
 meta/cfg/kernel-cache/bsp/romley/romley.cfg               | 3 ---
 meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg           | 3 ---
 meta/cfg/kernel-cache/bsp/valleyisland/valleyisland.cfg   | 4 ----
 meta/cfg/kernel-cache/features/soc/baytrail/baytrail.cfg  | 3 ---
 16 files changed, 46 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/hardware.cfg b/meta/cfg/kernel-cache/bsp/common-pc-64/hardware.cfg
index 474bb00..5349919 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/hardware.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/hardware.cfg
@@ -4,7 +4,6 @@ CONFIG_ATH_COMMON
 CONFIG_CFG80211
 CONFIG_CONNECTOR
 CONFIG_MAC80211
-CONFIG_SND_HDA_INTEL
 CONFIG_SERIAL_8250
 CONFIG_SERIAL_8250_CONSOLE
 CONFIG_SERIAL_8250_PCI
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
index e7c99d9..193b7b1 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
@@ -46,11 +46,6 @@ CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_FTDI_SIO=y
 CONFIG_USB_SERIAL_PL2303=y
 
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_PCI=y
-CONFIG_SND_HDA_INTEL=y
-
 CONFIG_I2C=y
 CONFIG_I2C_I801=y
 
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/hardware.cfg b/meta/cfg/kernel-cache/bsp/common-pc/hardware.cfg
index 4535378..562b88d 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/hardware.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/hardware.cfg
@@ -4,7 +4,6 @@ CONFIG_ATH_COMMON
 CONFIG_CFG80211
 CONFIG_CONNECTOR
 CONFIG_MAC80211
-CONFIG_SND_HDA_INTEL
 CONFIG_SERIAL_8250
 CONFIG_SERIAL_8250_CONSOLE
 CONFIG_PCNET32
diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg
index 35e9bbb..c1b02bc 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg
@@ -15,9 +15,6 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 CONFIG_SATA_AHCI=y
 CONFIG_AGP=y
 CONFIG_PM=y
diff --git a/meta/cfg/kernel-cache/bsp/crystalforest/crystalforest.cfg b/meta/cfg/kernel-cache/bsp/crystalforest/crystalforest.cfg
index 91a94a7..daee1ab 100644
--- a/meta/cfg/kernel-cache/bsp/crystalforest/crystalforest.cfg
+++ b/meta/cfg/kernel-cache/bsp/crystalforest/crystalforest.cfg
@@ -14,9 +14,6 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 
 # Make sure these are on, otherwise the bootup won't be fun
 CONFIG_UNIX=y
diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg
index f78cd82..c93a264 100644
--- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg
+++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg
@@ -10,15 +10,12 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
 CONFIG_I2C=y
 CONFIG_AGP=y
 CONFIG_PM=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_INPUT=y
-CONFIG_SND_HDA_INTEL=y
 
 # CONFIG_HPET_EMULATE_RTC is not set
 # CONFIG_MICROCODE_AMD is not set
diff --git a/meta/cfg/kernel-cache/bsp/emenlow/hardware.cfg b/meta/cfg/kernel-cache/bsp/emenlow/hardware.cfg
index d0ec083..e69de29 100644
--- a/meta/cfg/kernel-cache/bsp/emenlow/hardware.cfg
+++ b/meta/cfg/kernel-cache/bsp/emenlow/hardware.cfg
@@ -1 +0,0 @@
-CONFIG_SND_HDA_INTEL
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
index 1a4037e..ea79fea 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
@@ -14,9 +14,6 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 CONFIG_SATA_AHCI=y
 CONFIG_AGP=y
 CONFIG_PM=y
diff --git a/meta/cfg/kernel-cache/bsp/haswell-wc/haswell-wc.cfg b/meta/cfg/kernel-cache/bsp/haswell-wc/haswell-wc.cfg
index 1a76847..0402847 100644
--- a/meta/cfg/kernel-cache/bsp/haswell-wc/haswell-wc.cfg
+++ b/meta/cfg/kernel-cache/bsp/haswell-wc/haswell-wc.cfg
@@ -10,10 +10,6 @@ CONFIG_SATA_AHCI=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_INPUT=y
 CONFIG_PM=y
 
diff --git a/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.cfg b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.cfg
index 64b784d..e3075bd 100644
--- a/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.cfg
+++ b/meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.cfg
@@ -14,9 +14,6 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 
 # Make sure these are on, otherwise the bootup won't be fun
 CONFIG_UNIX=y
diff --git a/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg b/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg
index ef91a29..e5eed16 100644
--- a/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg
+++ b/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg
@@ -45,9 +45,6 @@ CONFIG_SERIAL_PCH_UART=y
 CONFIG_SERIAL_PCH_UART_CONSOLE=y
 
 ### Non-essential on-board features ###
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_HDA_INTEL=m
 
 # GPIO Support
 CONFIG_GPIO_SYSFS=y
diff --git a/meta/cfg/kernel-cache/bsp/rangeley/rangeley.cfg b/meta/cfg/kernel-cache/bsp/rangeley/rangeley.cfg
index 01ed740..c763a64 100644
--- a/meta/cfg/kernel-cache/bsp/rangeley/rangeley.cfg
+++ b/meta/cfg/kernel-cache/bsp/rangeley/rangeley.cfg
@@ -10,12 +10,9 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
 CONFIG_I2C=y
 CONFIG_AGP=y
 CONFIG_PM=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_INPUT=y
-CONFIG_SND_HDA_INTEL=y
diff --git a/meta/cfg/kernel-cache/bsp/romley/romley.cfg b/meta/cfg/kernel-cache/bsp/romley/romley.cfg
index 28f6d71..ac96127 100644
--- a/meta/cfg/kernel-cache/bsp/romley/romley.cfg
+++ b/meta/cfg/kernel-cache/bsp/romley/romley.cfg
@@ -20,9 +20,6 @@ CONFIG_NET=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 
 # Make sure these are on, otherwise the bootup won't be fun
 CONFIG_UNIX=y
diff --git a/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg
index 542f600..42980ae 100644
--- a/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg
+++ b/meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg
@@ -14,9 +14,6 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 
 # Make sure these are on, otherwise the bootup won't be fun
 CONFIG_UNIX=y
diff --git a/meta/cfg/kernel-cache/bsp/valleyisland/valleyisland.cfg b/meta/cfg/kernel-cache/bsp/valleyisland/valleyisland.cfg
index 140a006..486a1aa 100644
--- a/meta/cfg/kernel-cache/bsp/valleyisland/valleyisland.cfg
+++ b/meta/cfg/kernel-cache/bsp/valleyisland/valleyisland.cfg
@@ -13,10 +13,6 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_INPUT=y
 CONFIG_INPUT_EVDEV=y
 
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
-
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
diff --git a/meta/cfg/kernel-cache/features/soc/baytrail/baytrail.cfg b/meta/cfg/kernel-cache/features/soc/baytrail/baytrail.cfg
index c437b09..5543220 100644
--- a/meta/cfg/kernel-cache/features/soc/baytrail/baytrail.cfg
+++ b/meta/cfg/kernel-cache/features/soc/baytrail/baytrail.cfg
@@ -1,8 +1,5 @@
 CONFIG_PCI=y
 
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_SOC=m
 
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-- 
1.8.1.4



More information about the linux-yocto mailing list