From b14847fcefbbdffebd1a3370c325ebe51e611810 Mon Sep 17 00:00:00 2001
From: Giulio Moro <giuliomoro@yahoo.it>
Date: Sun, 10 May 2020 18:12:23 +0000
Subject: [PATCH] Setting CONFIG_SND_DAVINCI_SOC_MCASP and UIO_PRUSS to yes
 instead of M

---
 kernel/bela_defconfig                       | 30 ++++++++++-----------
 misc/rootfs/etc/modules-load.d/modules.conf |  2 --
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/kernel/bela_defconfig b/kernel/bela_defconfig
index f9c2d23..633fc59 100644
--- a/kernel/bela_defconfig
+++ b/kernel/bela_defconfig
@@ -3382,13 +3382,13 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_LOGO is not set
-CONFIG_SOUND=m
+CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
@@ -3445,15 +3445,15 @@ CONFIG_SND_USB_POD=m
 CONFIG_SND_USB_PODHD=m
 CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_SOC=m
+CONFIG_SND_SOC=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
-CONFIG_SND_EDMA_SOC=m
+CONFIG_SND_EDMA_SOC=y
 # CONFIG_SND_DAVINCI_SOC_I2S is not set
-CONFIG_SND_DAVINCI_SOC_MCASP=m
-CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
-CONFIG_SND_AM33XX_SOC_EVM=m
+CONFIG_SND_DAVINCI_SOC_MCASP=y
+CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=y
+CONFIG_SND_AM33XX_SOC_EVM=y
 # CONFIG_SND_DESIGNWARE_I2S is not set
 
 #
@@ -3497,7 +3497,7 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 # CONFIG_SND_SOC_OMAP_TWL4030 is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_I2C_AND_SPI=y
 
 #
 # CODEC drivers
@@ -3547,7 +3547,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_PCM179X_SPI is not set
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM5102A=y
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 # CONFIG_SND_SOC_PCM512x_SPI is not set
@@ -3572,7 +3572,7 @@ CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
 CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X=y
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TWL4030=m
 # CONFIG_SND_SOC_WM8510 is not set
@@ -4323,10 +4323,10 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_AUXDISPLAY is not set
-CONFIG_UIO=m
+CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_PRUSS=m
+CONFIG_UIO_PRUSS=y
 # CONFIG_UIO_PRUSS_SHMEM is not set
 # CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
diff --git a/misc/rootfs/etc/modules-load.d/modules.conf b/misc/rootfs/etc/modules-load.d/modules.conf
index 5d861b8..d79b3be 100644
--- a/misc/rootfs/etc/modules-load.d/modules.conf
+++ b/misc/rootfs/etc/modules-load.d/modules.conf
@@ -7,5 +7,3 @@ libcomposite
 rtdm_pruss_irq
 snd_usb_audio # for MIDI
 snd_usbmidi_lib # for MIDI
-uio_pruss
-snd_soc_davinci_mcasp