machine-xilinx-default.inc: Move defconfig setup

* Move the defconfig into machine-xilinx-default.inc, so that the
  defconfigs can be completely overridden from machine configs
* Add 3.14 defconfigs

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

3 files changed, 0 insertions, 11 deletions

diff --git a/recipes-kernel/linux/linux-machine-common.inc b/recipes-kernel/linux/linux-machine-common.inc
index c4a21c19..2b76cdee 100644
--- a/recipes-kernel/linux/linux-machine-common.inc
+++ b/recipes-kernel/linux/linux-machine-common.inc
@@ -9,8 +9,3 @@ MACHINE_DEVICETREE_append_zynq += " \
                 common/zynq-7-base.dtsi \
                 common/zynq-7-mainline-gem.dtsi \
                 "
-
-# Architecture specific kernel configuration parts, defconfigs for Xilinx architectures
-MACHINE_KCONFIG_LINUX_VERSION ?= "${@'.'.join(d.getVar('LINUX_VERSION', True).split('.')[0:2])}"
-MACHINE_KCONFIG_prepend_zynq += "common/linux/zynq/defconfig_${MACHINE_KCONFIG_LINUX_VERSION}.cfg "
-MACHINE_KCONFIG_prepend_microblaze += "common/linux/microblaze/defconfig_${MACHINE_KCONFIG_LINUX_VERSION}.cfg "
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index 239ea7cf..b9b6b9e3 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,8 +1,5 @@
 
 require linux-machine-common.inc
 
-# Use the 3.10 defconfigs
-MACHINE_KCONFIG_LINUX_VERSION = "3.10"
-
 COMPATIBLE_MACHINE_zynq = "zynq"
 COMPATIBLE_MACHINE_microblaze = "microblaze"
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 239ea7cf..b9b6b9e3 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -1,8 +1,5 @@
 
 require linux-machine-common.inc
 
-# Use the 3.10 defconfigs
-MACHINE_KCONFIG_LINUX_VERSION = "3.10"
-
 COMPATIBLE_MACHINE_zynq = "zynq"
 COMPATIBLE_MACHINE_microblaze = "microblaze"