linux/linux-machine-common.inc: Refactor defconfigs

* Refactor defconfig default setting of MACHINE_KCONFIG, moving it from
  linux-xlnx.inc to linux-machine-common.inc, to allow sharing between
  linux-xlnx and linux-yocto recipes
* Switch to prepending the configs, this ensures that the defconfigs are
  at the lowest priority, and that additional configs appended will
  override the defconfig

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

5 files changed, 11 insertions, 14 deletions

diff --git a/recipes-kernel/linux/linux-machine-common.inc b/recipes-kernel/linux/linux-machine-common.inc
index 2b76cdee..c4a21c19 100644
--- a/recipes-kernel/linux/linux-machine-common.inc
+++ b/recipes-kernel/linux/linux-machine-common.inc
@@ -9,3 +9,8 @@ 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-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index b72c0e04..3caddc87 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -23,8 +23,3 @@ require linux-machine-kconfig.inc
 
 # Override COMPATIBLE_MACHINE to include your machine in a bbappend file.
 COMPATIBLE_MACHINE = "qemumicroblaze|qemuzynq|microblaze|zynq"
-
-# Common kernel configuration parts
-# Arch specific kernel configuration parts
-MACHINE_KCONFIG_append_zynq += "common/linux/zynq/defconfig_${LINUX_VERSION}.cfg"
-MACHINE_KCONFIG_append_microblaze += "common/linux/microblaze/defconfig_${LINUX_VERSION}.cfg"
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index 0e924c7d..239ea7cf 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,8 +1,8 @@
 
 require linux-machine-common.inc
 
+# Use the 3.10 defconfigs
+MACHINE_KCONFIG_LINUX_VERSION = "3.10"
+
 COMPATIBLE_MACHINE_zynq = "zynq"
 COMPATIBLE_MACHINE_microblaze = "microblaze"
-
-MACHINE_KCONFIG_append_zynq += "common/linux/zynq/defconfig_3.10.cfg"
-MACHINE_KCONFIG_append_microblaze += "common/linux/microblaze/defconfig_3.10.cfg"
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 4990ae67..3601d587 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -4,8 +4,5 @@ require linux-machine-common.inc
 COMPATIBLE_MACHINE_zynq = "zynq"
 COMPATIBLE_MACHINE_microblaze = "microblaze"
 
-MACHINE_KCONFIG_append_zynq += "common/linux/zynq/defconfig_3.10.cfg"
-MACHINE_KCONFIG_append_microblaze += "common/linux/microblaze/defconfig_3.10.cfg"
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
 SRC_URI_append_microblaze += "file://ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch"
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 0e924c7d..239ea7cf 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -1,8 +1,8 @@
 
 require linux-machine-common.inc
 
+# Use the 3.10 defconfigs
+MACHINE_KCONFIG_LINUX_VERSION = "3.10"
+
 COMPATIBLE_MACHINE_zynq = "zynq"
 COMPATIBLE_MACHINE_microblaze = "microblaze"
-
-MACHINE_KCONFIG_append_zynq += "common/linux/zynq/defconfig_3.10.cfg"
-MACHINE_KCONFIG_append_microblaze += "common/linux/microblaze/defconfig_3.10.cfg"