boards/common: Re-organize defconfig paths

* Move to linux/<arch> sub directories
* Update machine and kernel paths

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

8 files changed, 5 insertions, 4 deletions

diff --git a/conf/machine/boards/common/microblaze_defconfig_3.10.cfg b/conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg
index f269d9fd..f269d9fd 100644
--- a/conf/machine/boards/common/microblaze_defconfig_3.10.cfg
+++ b/conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg
diff --git a/conf/machine/boards/common/microblaze_defconfig_3.8.cfg b/conf/machine/boards/common/linux/microblaze/defconfig_3.8.cfg
index 63d400f0..63d400f0 100644
--- a/conf/machine/boards/common/microblaze_defconfig_3.8.cfg
+++ b/conf/machine/boards/common/linux/microblaze/defconfig_3.8.cfg
diff --git a/conf/machine/boards/common/rtc.cfg b/conf/machine/boards/common/linux/rtc.cfg
index ac838f1d..ac838f1d 100644
--- a/conf/machine/boards/common/rtc.cfg
+++ b/conf/machine/boards/common/linux/rtc.cfg
diff --git a/conf/machine/boards/common/zynq_defconfig_3.10.cfg b/conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg
index 8481b308..8481b308 100644
--- a/conf/machine/boards/common/zynq_defconfig_3.10.cfg
+++ b/conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg
diff --git a/conf/machine/boards/common/zynq_defconfig_3.8.cfg b/conf/machine/boards/common/linux/zynq/defconfig_3.8.cfg
index 997532dc..997532dc 100644
--- a/conf/machine/boards/common/zynq_defconfig_3.8.cfg
+++ b/conf/machine/boards/common/linux/zynq/defconfig_3.8.cfg
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 10984e7c..5500e1f8 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -22,4 +22,4 @@ MACHINE_DEVICETREE := " \
                 zc702/zc702-zynq7.dts \
                 "
 
-MACHINE_KCONFIG := "common/rtc.cfg"
+MACHINE_KCONFIG := "common/linux/rtc.cfg"
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index eabc319a..f2a50bb3 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -21,3 +21,5 @@ MACHINE_DEVICETREE := " \
                 zc706/zc706-zynq7-board.dtsi \
                 zc706/zc706-zynq7.dts \
                 "
+
+MACHINE_KCONFIG := "common/linux/rtc.cfg"
diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index 91afd952..f1a7f829 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -11,7 +11,6 @@ PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCREV}"
 # Sources
 KBRANCH ?= "master"
 SRC_URI = "git://github.com/Xilinx/linux-xlnx;protocol=git;branch=${KBRANCH}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 
 # Source Directory
@@ -26,8 +25,8 @@ COMPATIBLE_MACHINE = "qemumicroblaze|qemuzynq|microblaze|zynq"
 
 # Common kernel configuration parts
 # Arch specific kernel configuration parts
-MACHINE_KCONFIG_append_zynq += "common/zynq_defconfig_${LINUX_VERSION}.cfg"
-MACHINE_KCONFIG_append_microblaze += "common/microblaze_defconfig_${LINUX_VERSION}.cfg"
+MACHINE_KCONFIG_append_zynq += "common/linux/zynq/defconfig_${LINUX_VERSION}.cfg"
+MACHINE_KCONFIG_append_microblaze += "common/linux/microblaze/defconfig_${LINUX_VERSION}.cfg"
 
 # returns all the elements from the src uri that are .cfg files
 def find_config_fragments(d):