Refactored MACHINE_* usage

* Added 'conf/machine/boards' as a default FILESEXTRAPATH
  (for each available layer).
* Change MACHINE_* to rely only on the path being relative to
  'conf/machine/boards'.
* Fixed up linux-xlnx.inc and linux-machine-common.inc to use 'MACHINE_*'
  for default files.
* Fixed KERNEL_DEVICETREE setting such that the variable is valid before
  the base __anonymous function of linux-dtb.inc is executed.

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

5 files changed, 11 insertions, 11 deletions

diff --git a/conf/machine/kc705-trd-microblazeel.conf b/conf/machine/kc705-trd-microblazeel.conf
index 4552824e..86315ba6 100644
--- a/conf/machine/kc705-trd-microblazeel.conf
+++ b/conf/machine/kc705-trd-microblazeel.conf
@@ -19,6 +19,6 @@ TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift pattern-compa
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_DEVICETREE := "${XILINX_BOARDDIR}/kc705/kc705-trd-microblazeel.dts"
-MACHINE_KCONFIG := "${XILINX_BOARDDIR}/kc705/kc705-trd-microblazeel.kconfig.cfg"
-MACHINE_XPARAMETERS := "${XILINX_BOARDDIR}/kc705/kc705-trd-microblazeel.xparameters.h"
+MACHINE_DEVICETREE := "kc705/kc705-trd-microblazeel.dts"
+MACHINE_KCONFIG := "kc705/kc705-trd-microblazeel.kconfig.cfg"
+MACHINE_XPARAMETERS := "kc705/kc705-trd-microblazeel.xparameters.h"
diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
index 67a22f3e..824dbf47 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/qemumicroblaze.conf
@@ -9,5 +9,5 @@ TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift reorder patte
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_DEVICETREE := "${XILINX_BOARDDIR}/qemu/qemumicroblaze.dts"
-MACHINE_KCONFIG := "${XILINX_BOARDDIR}/qemu/qemumicroblaze.cfg"
+MACHINE_DEVICETREE := "qemu/qemumicroblaze.dts"
+MACHINE_KCONFIG := "qemu/qemumicroblaze.cfg"
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index 7db1b0bb..a260dd32 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -8,4 +8,4 @@ require conf/machine/include/tune-zynq.inc
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-MACHINE_DEVICETREE := "${XILINX_BOARDDIR}/qemu/qemuzynq.dts"
+MACHINE_DEVICETREE := "qemu/qemuzynq.dts"
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 2db72377..bb7fb8d7 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -19,5 +19,5 @@ UBOOT_MACHINE = "zynq_zc70x_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-MACHINE_DEVICETREE := "${XILINX_BOARDDIR}/zc702/zc702-zynq7.dts"
-MACHINE_KCONFIG := "${XILINX_BOARDDIR}/common/rtc.cfg"
+MACHINE_DEVICETREE := "zc702/zc702-zynq7.dts"
+MACHINE_KCONFIG := "common/rtc.cfg"
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index 18223796..6dbb8f75 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -20,7 +20,7 @@ UBOOT_MACHINE = "zynq_zed_config"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_DEVICETREE := " \
-                ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7.dtsi \
-                ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7-mmcblk0p2.dts \
-                ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7-ram.dts \
+                zedboard/zedboard-zynq7.dtsi \
+                zedboard/zedboard-zynq7-mmcblk0p2.dts \
+                zedboard/zedboard-zynq7-ram.dts \
                 "