From cc4966c025740ab2a637790b71d9e5b3d02c8603 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 12 May 2017 21:53:50 +0100 Subject: [PATCH] linux: update with 4.11-rc4 options --- projects/Generic/linux/linux.x86_64.conf | 4 ++-- projects/RPi/devices/RPi/linux/linux.arm.conf | 5 ++++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 0b4a507203..75f6a02592 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.11.0-rc2 Kernel Configuration +# Linux/x86_64 4.11.0-rc4 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3761,7 +3761,7 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_TPA6130A2 is not set CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m -CONFIG_SND_X86=m +CONFIG_SND_X86=y CONFIG_HDMI_LPE_AUDIO=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index e77db06738..fcc2b2f6ae 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.11.0-rc2 Kernel Configuration +# Linux/arm 4.11.0-rc4 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -3306,6 +3306,9 @@ CONFIG_MMC_BLOCK_BOUNCE=y # # MMC/SD/SDIO Host Controller Drivers # +CONFIG_MMC_BCM2835=y +CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_BCM2835_SDHOST=y # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 16585ea1a1..147eba530b 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.11.0-rc2 Kernel Configuration +# Linux/arm 4.11.0-rc4 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -3398,6 +3398,9 @@ CONFIG_MMC_BLOCK_BOUNCE=y # # MMC/SD/SDIO Host Controller Drivers # +CONFIG_MMC_BCM2835=y +CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_BCM2835_SDHOST=y # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI=y