diff --git a/recipes-kernel/linux/linux-ti-staging-3.14/ipc.cfg b/recipes-kernel/linux/linux-ti-staging-3.14/ipc.cfg deleted file mode 100644 index 645dfdfa..00000000 --- a/recipes-kernel/linux/linux-ti-staging-3.14/ipc.cfg +++ /dev/null @@ -1,18 +0,0 @@ -################################################## -# IPC config options -################################################## -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_OF_IOMMU=y -CONFIG_OMAP_IOMMU=y -CONFIG_OMAP_IOVMM=y -CONFIG_OMAP_IOMMU_DEBUG=y -CONFIG_VIRTIO=m -CONFIG_RPMSG=m -CONFIG_RPMSG_RPC=m -CONFIG_REMOTEPROC=m -CONFIG_OMAP_REMOTEPROC=m -CONFIG_OMAP_REMOTEPROC_IPU=y -CONFIG_OMAP_REMOTEPROC_DSP=y -CONFIG_OMAP_REMOTEPROC_IPU1=y -CONFIG_OMAP_REMOTEPROC_DSP2=y diff --git a/recipes-kernel/linux/linux-ti-staging-3.14/systest.cfg b/recipes-kernel/linux/linux-ti-staging-3.14/systest.cfg deleted file mode 100644 index e21602f4..00000000 --- a/recipes-kernel/linux/linux-ti-staging-3.14/systest.cfg +++ /dev/null @@ -1,20 +0,0 @@ -################################################## -# Systest config options -################################################## -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_KMEMLEAK=y -CONFIG_DEVKMEM=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=400 -CONFIG_DEBUG_KMEMLEAK_TEST=n -CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=n -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_PM_DEBUG=y -CONFIG_DEBUG_GPIO=y -CONFIG_USB_DEBUG=y -CONFIG_SND_DEBUG=y -CONFIG_RTC_DEBUG=y diff --git a/recipes-kernel/linux/linux-ti-staging_3.14.bb b/recipes-kernel/linux/linux-ti-staging_3.14.bb index 8c12bad8..fd8e1f22 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.14.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.14.bb @@ -45,21 +45,22 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-3.14.y" -SRCREV = "9d00dd1187099b0841125220c7432a3507e5b5fa" -PV = "3.14.8" +SRCREV = "fc907b1464b03aa571a1003020bf711da041e5aa" +PV = "3.14.13" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}" PR = "${MACHINE_KERNEL_PR}" -KERNEL_CONFIG_DIR = "ti_config_fragments" -KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/ipc.cfg" +KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" +KERNEL_CONFIG_FRAGMENTS = "${KERNEL_CONFIG_DIR}/audio_display.cfg ${KERNEL_CONFIG_DIR}/baseport.cfg \ + ${KERNEL_CONFIG_DIR}/connectivity.cfg ${KERNEL_CONFIG_DIR}/ipc.cfg \ + ${KERNEL_CONFIG_DIR}/power.cfg" + KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${WORKDIR}/non-smp.cfg" KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${WORKDIR}/non-smp.cfg" SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ file://defconfig \ - file://ipc.cfg \ - file://systest.cfg \ file://non-smp.cfg \ "