Move include of 'soc-family.inc' into Tune definitions

* Resolves issues with linux-xlnx recipe when building with machines
  that are not using SOC_FAMILY features.

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

3 files changed, 2 insertions, 1 deletions

diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index 4eee2670..c908bb46 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -2,6 +2,7 @@ DEFAULTTUNE ?= "microblaze"
 SOC_FAMILY ?= "microblaze"
 
 require conf/machine/include/tune-microblaze-features.inc
+require conf/machine/include/soc-family.inc
 
 TUNEVALID[microblaze] = "Microblaze"
 AVAILTUNES += "microblaze"
diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
index a3054c64..368fe343 100644
--- a/conf/machine/include/tune-zynq.inc
+++ b/conf/machine/include/tune-zynq.inc
@@ -2,6 +2,7 @@ DEFAULTTUNE ?= "zynq"
 SOC_FAMILY ?= "zynq"
 
 require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/soc-family.inc
 
 TUNEVALID[zynq] = "Zynq"
 AVAILTUNES += "zynq"
diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index 0f2a4cd9..230120ae 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -4,7 +4,6 @@ inherit kernel
 LINUX_VERSION_EXTENSION ?= "-xilinx"
 
 require recipes-kernel/linux/linux-yocto.inc
-require conf/machine/include/soc-family.inc
 
 # MicroBlaze is a uImage target, but its not called 'uImage'
 DEPENDS_append_microblaze += "u-boot-mkimage-native"