diff --git a/patches/defconfig b/patches/defconfig index b2292eec8d6273a25f58215084f416cadb7aef4a..7387d86202c96014fbea2e1e235f97229be21c0a 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -4184,7 +4184,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m # @@ -4322,6 +4321,7 @@ CONFIG_IMX_SDMA=y # CONFIG_MXS_DMA is not set CONFIG_DMA_OMAP=y CONFIG_TI_CPPI41=y +# CONFIG_FSL_EDMA is not set CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y diff --git a/patches/example_imx_v6_v7_defconfig b/patches/example_imx_v6_v7_defconfig index 736720c6b8501ae66268e9b2b894c73ccb42c60b..94e4641c6248c17d3d2f46afb80cb1df0e64e58a 100644 --- a/patches/example_imx_v6_v7_defconfig +++ b/patches/example_imx_v6_v7_defconfig @@ -2859,7 +2859,6 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_MC13783 is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_LM355x is not set -# CONFIG_LEDS_OT200 is not set # CONFIG_LEDS_BLINKM is not set # @@ -2987,6 +2986,7 @@ CONFIG_MX3_IPU_IRQS=4 CONFIG_IMX_SDMA=y # CONFIG_IMX_DMA is not set CONFIG_MXS_DMA=y +# CONFIG_FSL_EDMA is not set CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y diff --git a/patches/example_omap2plus_defconfig b/patches/example_omap2plus_defconfig index 4a27fad8ec41e0c74a44eb3f94950aaddb4f5e89..3697d5278410c85149c457d4aeb4267403d09f57 100644 --- a/patches/example_omap2plus_defconfig +++ b/patches/example_omap2plus_defconfig @@ -2652,6 +2652,7 @@ CONFIG_DMADEVICES=y CONFIG_TI_EDMA=y CONFIG_DMA_OMAP=y # CONFIG_TI_CPPI41 is not set +# CONFIG_FSL_EDMA is not set CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y diff --git a/patches/ref_multi_v7_defconfig b/patches/ref_multi_v7_defconfig index 951c4b879ac2295dbcac4e500e67994cf61d7de3..d6b8dd9f71f87de712e7473d96598c0cea5b8c08 100644 --- a/patches/ref_multi_v7_defconfig +++ b/patches/ref_multi_v7_defconfig @@ -3435,6 +3435,7 @@ CONFIG_MXS_DMA=y CONFIG_DMA_OMAP=y # CONFIG_TI_CPPI41 is not set # CONFIG_K3_DMA is not set +# CONFIG_FSL_EDMA is not set CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y @@ -3445,6 +3446,7 @@ CONFIG_DMA_OF=y # CONFIG_ASYNC_TX_DMA is not set # CONFIG_DMATEST is not set CONFIG_DMA_ENGINE_RAID=y +# CONFIG_QCOM_BAM_DMA is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set # CONFIG_VFIO is not set diff --git a/version.sh b/version.sh index a34778b2b697c478b7cab28d4ea3a2cba2b8ba62..fd84c00273641b5de93961eaade15d764dadf5ad 100644 --- a/version.sh +++ b/version.sh @@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8" #Kernel/Build KERNEL_REL=3.14 KERNEL_TAG=${KERNEL_REL} -BUILD=armv7-devel-r13 +BUILD=armv7-devel-r14 #v3.X-rcX + upto SHA -KERNEL_SHA="39de65aa2c3eee901db020a4f1396998e09602a3" +KERNEL_SHA="4ba85265790ba3681deeaf73f018c0eb829a7341" #git branch #BRANCH="v3.15.x"