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>

1 files changed, 11 insertions, 4 deletions

diff --git a/recipes-bsp/u-boot/u-boot-extra.inc b/recipes-bsp/u-boot/u-boot-extra.inc
index 79808a37..e1c89d05 100644
--- a/recipes-bsp/u-boot/u-boot-extra.inc
+++ b/recipes-bsp/u-boot/u-boot-extra.inc
@@ -20,9 +20,16 @@ do_deploy_append() {
 # and generate a u-boot specific config.mk
 do_configure_prepend () {
         if [ "${SOC_FAMILY}" = "microblaze" -a ! -z "${MACHINE_XPARAMETERS}" ]; then
-                if [ ! -z "${MACHINE_XPARAMETERS}" -a -e "${MACHINE_XPARAMETERS}" ]; then
+                # Find the file based on the avaliable layers (using $BBPATH)
+                MACHINE_XPARAMETERS_ABSOLUTE=
+                for i in ${BBPATH}; do
+                        if [ -e $i/conf/machine/boards/${MACHINE_XPARAMETERS} ]; then
+                                MACHINE_XPARAMETERS_ABSOLUTE = $i/conf/machine/boards/${MACHINE_XPARAMETERS}
+                        fi
+                done
+                if [ -e "${MACHINE_XPARAMETERS_ABSOLUTE}" ]; then
                         CONFIG_MK=${S}/board/xilinx/microblaze-generic/config.mk
-                        cp ${MACHINE_XPARAMETERS} ${S}/board/xilinx/microblaze-generic/xparameters.h
+                        cp ${MACHINE_XPARAMETERS_ABSOLUTE} ${S}/board/xilinx/microblaze-generic/xparameters.h
 
                         # Generate the config.mk from CFLAGS and XPARAMETERS file
                         echo "# This file is generated by the meta-xilinx layer." > ${CONFIG_MK}
@@ -36,8 +43,8 @@ do_configure_prepend () {
                         echo "" >> ${CONFIG_MK}
 
                         # Calculate the TEXT_BASE address at RAM_END - 4MB
-                        RAM_START=$(grep "XILINX_RAM_START" ${MACHINE_XPARAMETERS} | grep -o "0x.*$")
-                        RAM_SIZE=$(grep "XILINX_RAM_SIZE" ${MACHINE_XPARAMETERS} | grep -o "0x.*$")
+                        RAM_START=$(grep "XILINX_RAM_START" ${MACHINE_XPARAMETERS_ABSOLUTE} | grep -o "0x.*$")
+                        RAM_SIZE=$(grep "XILINX_RAM_SIZE" ${MACHINE_XPARAMETERS_ABSOLUTE} | grep -o "0x.*$")
                         BASE_OFFSET=$(printf "0x%08x" "$[$RAM_START + $RAM_SIZE - 0x400000]")
 
                         echo "TEXT_BASE = $BASE_OFFSET" >> ${CONFIG_MK}