ti_config_fragments: v8_audio_display: Trim out defaults

With the same justification as the previous patches in this series.
Move option pruning into the prune.cfg file and remove the remaining
option additions that do not change defaults.

Signed-off-by: Andrew Davis <afd@ti.com>

2 files changed, 43 insertions, 127 deletions

diff --git a/ti_config_fragments/arm64_prune.cfg b/ti_config_fragments/arm64_prune.cfg
index ce52f8a640ee..d84ad7749e77 100644
--- a/ti_config_fragments/arm64_prune.cfg
+++ b/ti_config_fragments/arm64_prune.cfg
@@ -80,3 +80,30 @@ CONFIG_PCI_HISI=n
 CONFIG_PCIE_KIRIN=n
 
 CONFIG_DEBUG_INFO=n
+
+# DRM
+CONFIG_DRM_NOUVEAU=n
+CONFIG_DRM_I2C_ADV7511=n
+CONFIG_DRM_ETNAVIV=n
+CONFIG_DRM_HISI_HIBMC=n
+CONFIG_DRM_HISI_KIRIN=n
+CONFIG_DRM_MXSFB=n
+CONFIG_DRM_PL111=n
+CONFIG_DRM_LIMA=n
+CONFIG_DRM_PANFROST=n
+
+# Video
+CONFIG_VGA_ARB=n
+CONFIG_FB_EFI=n
+
+# V4L2
+CONFIG_RC_CORE=n
+
+# Sound
+CONFIG_SND_SPI=n
+CONFIG_SND_SOC_FSL_SAI=n
+CONFIG_SND_SOC_AK4613=n
+CONFIG_SND_SOC_ES7134=n
+CONFIG_SND_SOC_ES7241=n
+CONFIG_SND_SOC_PCM3168A_I2C=n
+CONFIG_SND_SOC_TAS571X=n
diff --git a/ti_config_fragments/v8_audio_display.cfg b/ti_config_fragments/v8_audio_display.cfg
index 805eda239014..7df3e94b570f 100644
--- a/ti_config_fragments/v8_audio_display.cfg
+++ b/ti_config_fragments/v8_audio_display.cfg
@@ -20,18 +20,18 @@ CONFIG_BACKLIGHT_LED=y
 CONFIG_FB_SSD1307=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
-# drm
-
+# DRM
 CONFIG_DRM=y
+CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=y
 CONFIG_DRM_DISPLAY_CONNECTOR=y
-CONFIG_DRM_SII902X=y
-CONFIG_DRM_TI_TFP410=y
-CONFIG_DRM_TI_TPD12S015=y
 CONFIG_DRM_LVDS_CODEC=y
+CONFIG_DRM_SII902X=y
 CONFIG_DRM_TOSHIBA_TC358767=y
 CONFIG_DRM_TOSHIBA_TC358768=y
-CONFIG_DRM_PANEL_SIMPLE=y
-CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=y
+CONFIG_DRM_TI_TFP410=y
+CONFIG_DRM_TI_TPD12S015=y
+
 # Firmware loading only works if built as module
 CONFIG_DRM_CDNS_MHDP8546=m
 CONFIG_DRM_CDNS_DSI=m
@@ -41,148 +41,37 @@ CONFIG_PHY_CADENCE_TORRENT=y
 
 # SGX driver needs legacy support
 CONFIG_DRM_LEGACY=y
-CONFIG_DRM_VM=y
-
-# tilcdc
 
 CONFIG_DRM_I2C_NXP_TDA998X=y
-CONFIG_DRM_TILCDC=y
-
-# omapdrm
-
-CONFIG_DRM_OMAP=y
-CONFIG_DRM_OMAP_WB=y
-CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_DSS_DEBUGFS=y
-CONFIG_OMAP2_DSS_DPI=y
-CONFIG_OMAP2_DSS_VENC=n
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP5_DSS_HDMI=y
-CONFIG_OMAP2_DSS_SDI=n
-CONFIG_OMAP2_DSS_DSI=n
 
 # tidss
 CONFIG_DRM_TIDSS=y
-CONFIG_DRM_TIDSS_WB=y
-CONFIG_DRM_TIDSS_DSS6=y
-CONFIG_DRM_TIDSS_DSS7=y
-
-# Disable unneeded features
-
-CONFIG_VGA_ARB=n
-CONFIG_DRM_I2C_ADV7511=n
-CONFIG_DRM_NOUVEAU=n
-CONFIG_DRM_EXYNOS=n
-CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=n
-CONFIG_DRM_NXP_PTN3460=n
-CONFIG_DRM_PARADE_PS8622=n
-CONFIG_DRM_STI=n
-CONFIG_DRM_PANEL_SAMSUNG_LD9040=n
-CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=n
-CONFIG_DRM_DUMB_VGA_DAC=n
-CONFIG_LCD_CLASS_DEVICE=n
-CONFIG_FB_EFI=n
-CONFIG_FB_SIMPLE=n
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=n
-CONFIG_DRM_HISI_KIRIN=n
-CONFIG_FB_ARMCLCD=n
-CONFIG_XEN_FBDEV_FRONTEND=n
-CONFIG_DRM_RCAR_LVDS=n
-CONFIG_DRM_FSL_DCU=n
-CONFIG_DRM_SII9234=n
-CONFIG_DRM_MXSFB=n
-CONFIG_DRM_HISI_HIBMC=n
-CONFIG_DRM_ATMEL_HLCDC=n
-CONFIG_DRM_STM=n
-CONFIG_DRM_PANEL_ORISETECH_OTM8009A=n
-CONFIG_DRM_PANEL_RAYDIUM_RM68200=n
-CONFIG_DRM_TOSHIBA_TC358764=n
-CONFIG_DRM_ETNAVIV=n
-CONFIG_DRM_PL111=n
-CONFIG_DRM_LIMA=n
-CONFIG_DRM_PANFROST=n
 
 # Touchscreen
-
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
-
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_HID_MULTITOUCH=m
 
 # V4L2
-
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_AM437X_VPFE=m
-CONFIG_VIDEO_TI_CAL=m
-CONFIG_VIDEO_TI_VIP=m
-
 CONFIG_VIDEO_CADENCE=y
 CONFIG_VIDEO_CADENCE_CSI2RX=m
-CONFIG_PHY_CADENCE_DPHY=m
+CONFIG_VIDEO_TI_CAL=m
 CONFIG_VIDEO_TI_J721E_CSI2RX=m
-
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_TI_VPE=m
-
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=n
+CONFIG_VIDEO_IMX390=m
 CONFIG_VIDEO_OV2659=m
-CONFIG_VIDEO_OV1063X=m
-CONFIG_VIDEO_MT9T11X=m
-CONFIG_VIDEO_OV490=m
 CONFIG_VIDEO_OV5640=m
-CONFIG_VIDEO_IMX390=m
-
-CONFIG_VIDEO_DS90UB960=m
+CONFIG_VIDEO_OV1063X=m
 CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
+CONFIG_PHY_CADENCE_DPHY=m
 
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=n
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=n
-CONFIG_RC_CORE=n
-
-# sound - START
-CONFIG_SND_ARM=n
-CONFIG_SND_SPI=n
-CONFIG_SND_ATMEL_SOC=n
-CONFIG_SND_SOC_FSL_SAI=n
-CONFIG_SND_SOC_AK4642=n
-CONFIG_SND_SOC_CPCAP=n
-CONFIG_SND_SOC_SGTL5000=n
-CONFIG_SND_SOC_STI_SAS=n
-CONFIG_SND_SOC_WM8978=n
-CONFIG_SND_SOC_AK4613=n
-CONFIG_SND_SOC_ES7134=n
-CONFIG_SND_SOC_ES7241=n
-CONFIG_SND_SOC_TAS571X=n
-
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m
-
+# Sound
 CONFIG_SND_SOC_DAVINCI_MCASP=y
-CONFIG_SND_SOC_OMAP_HDMI=m
 CONFIG_SND_SOC_J721E_EVM=m
-
-CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-# sound - END
+CONFIG_SND_SOC_TLV320AIC3X=m
 
 # display sharing
 CONFIG_RPMSG_KDRV_DISPLAY=y