From 3c1526ede5df1e74df1f0e465a32c59f3627d11d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 16 Jul 2015 18:50:00 +0200 Subject: [PATCH] meta-digi-arm: enable SPIDEV for ccardimx28js in kernel 3.10 Also remove kernel configuration fragments for kernel 3.10. This is not needed for 3.10 as all the configuration is done via device-trees. https://jira.digi.com/browse/DEL-1695 Signed-off-by: Javier Viguera (cherry picked from commit b0031915f1c7f3eeba680161827e78bbac9eebb4) --- .../linux/linux-dey-3.10/ccardimx28js/defconfig | 1 + .../recipes-kernel/linux/linux-dey-3.10/config-spidev.cfg | 1 - meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 3 +++ meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 4 ---- 4 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/config-spidev.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig index dcc575db8..2699f0629 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig @@ -121,6 +121,7 @@ CONFIG_I2C_MXS=y CONFIG_SPI=y CONFIG_SPI_GPIO=y CONFIG_SPI_MXS=y +CONFIG_SPI_SPIDEV=y CONFIG_GPIO_SYSFS=y CONFIG_W1=y CONFIG_W1_MASTER_DS2482=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/config-spidev.cfg b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/config-spidev.cfg deleted file mode 100644 index 30fa69611..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/config-spidev.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SPI_SPIDEV=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index e324d79ff..014c91030 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -4,6 +4,9 @@ require recipes-kernel/linux/linux-imx.inc LOCALVERSION = "-dey" +# Kernel configuration fragments +KERNEL_CFG_FRAGS ??= "" + SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git;nobranch=1" SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${SRCBRANCH}" SRC_URI = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index b1fc97ba0..480c3ed96 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -17,10 +17,6 @@ SRCREV_internal_mxs = "${AUTOREV}" SRCREV_internal_mx6 = "${AUTOREV}" SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" -# Kernel configuration fragments -KERNEL_CFG_FRAGS ?= "" -KERNEL_CFG_FRAGS_append = " ${@base_conditional('HAVE_EXAMPLE', '1' , 'file://config-spidev.cfg', '', d)}" - config_dts() { for DTB in ${KERNEL_DEVICETREE}; do if [ "${1}" = "enable" ]; then