Commit 80acbaee authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman

ARM: shmobile: defconfig: Refresh for v5.1-rc1

Update the defconfig for Renesas ARM boards:
  - Move CMA-related config options (moved in commit ddb26d8e
    ("dma-mapping: move CONFIG_DMA_CMA to kernel/dma/Kconfig"),
  - Drop CONFIG_DRM_RCAR_LVDS=y (auto-enabled since commit
    02f2b300 ("drm: rcar-du: lvds: Add API to enable/disable
    clock output")),
  - Drop CONFIG_SND_SIMPLE_SCU_CARD=y (removed in commit
    c8ed6aca ("ASoC: simple-scu-card: remove simple-scu-card")).
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 9e98c678
...@@ -43,8 +43,6 @@ CONFIG_PCI_RCAR_GEN2=y ...@@ -43,8 +43,6 @@ CONFIG_PCI_RCAR_GEN2=y
CONFIG_PCIE_RCAR=y CONFIG_PCIE_RCAR=y
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_SIMPLE_PM_BUS=y CONFIG_SIMPLE_PM_BUS=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
...@@ -123,7 +121,6 @@ CONFIG_VIDEO_ADV7604=y ...@@ -123,7 +121,6 @@ CONFIG_VIDEO_ADV7604=y
CONFIG_VIDEO_ML86V7667=y CONFIG_VIDEO_ML86V7667=y
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_RCAR_DU=y CONFIG_DRM_RCAR_DU=y
CONFIG_DRM_RCAR_LVDS=y
CONFIG_DRM_DUMB_VGA_DAC=y CONFIG_DRM_DUMB_VGA_DAC=y
CONFIG_DRM_SII902X=y CONFIG_DRM_SII902X=y
CONFIG_DRM_I2C_ADV7511=y CONFIG_DRM_I2C_ADV7511=y
...@@ -141,7 +138,6 @@ CONFIG_SND_SOC_RCAR=y ...@@ -141,7 +138,6 @@ CONFIG_SND_SOC_RCAR=y
CONFIG_SND_SOC_AK4642=y CONFIG_SND_SOC_AK4642=y
CONFIG_SND_SOC_SGTL5000=y CONFIG_SND_SOC_SGTL5000=y
CONFIG_SND_SOC_WM8978=y CONFIG_SND_SOC_WM8978=y
CONFIG_SND_SIMPLE_SCU_CARD=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_XHCI_PLATFORM=y
...@@ -209,6 +205,8 @@ CONFIG_NFS_V4_1=y ...@@ -209,6 +205,8 @@ CONFIG_NFS_V4_1=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_1=y
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_PRINTK_TIME=y CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment