diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2019-04-01 13:56:25 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2019-04-03 10:57:15 +0200 |
| commit | 80acbaee26b5a6842ec64fb7efb2d7af68921060 (patch) | |
| tree | 7ad6f835a76981233fe552d9121b66f678b599bb | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
ARM: shmobile: defconfig: Refresh for v5.1-rc1
Update the defconfig for Renesas ARM boards:
- Move CMA-related config options (moved in commit ddb26d8e1e97af23
("dma-mapping: move CONFIG_DMA_CMA to kernel/dma/Kconfig"),
- Drop CONFIG_DRM_RCAR_LVDS=y (auto-enabled since commit
02f2b30032c12b1b ("drm: rcar-du: lvds: Add API to enable/disable
clock output")),
- Drop CONFIG_SND_SIMPLE_SCU_CARD=y (removed in commit
c8ed6aca6b824018 ("ASoC: simple-scu-card: remove simple-scu-card")).
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 9b0efac101ab..41e773619c51 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -43,8 +43,6 @@ CONFIG_PCI_RCAR_GEN2=y CONFIG_PCIE_RCAR=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y @@ -123,7 +121,6 @@ CONFIG_VIDEO_ADV7604=y CONFIG_VIDEO_ML86V7667=y CONFIG_DRM=y CONFIG_DRM_RCAR_DU=y -CONFIG_DRM_RCAR_LVDS=y CONFIG_DRM_DUMB_VGA_DAC=y CONFIG_DRM_SII902X=y CONFIG_DRM_I2C_ADV7511=y @@ -141,7 +138,6 @@ CONFIG_SND_SOC_RCAR=y CONFIG_SND_SOC_AK4642=y CONFIG_SND_SOC_SGTL5000=y CONFIG_SND_SOC_WM8978=y -CONFIG_SND_SIMPLE_SCU_CARD=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PLATFORM=y @@ -209,6 +205,8 @@ CONFIG_NFS_V4_1=y CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_DEBUG_KERNEL=y |