u-boot-extra.inc: Refactored to use xilinx-utils functions

* Fixed issue with manual searching of BBPATH
* Cleaned up to use same SRC_URI append method as linux-machine-config

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

1 files changed, 29 insertions, 27 deletions

diff --git a/recipes-bsp/u-boot/u-boot-extra.inc b/recipes-bsp/u-boot/u-boot-extra.inc
index e1c89d05..e476b22e 100644
--- a/recipes-bsp/u-boot/u-boot-extra.inc
+++ b/recipes-bsp/u-boot/u-boot-extra.inc
@@ -1,4 +1,6 @@
 
+inherit xilinx-utils
+
 S = "${WORKDIR}/git"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -16,39 +18,39 @@ do_deploy_append() {
         ln -sf ${DEST_ELF} ${SRC_ELF}.elf
 }
 
+# Appends the '<layer>/conf/machine/boards' path to FILESEXTRAPATHS for all
+# layers (using the ${BBPATH})
+FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards', d)}"
+
+# Append the xparameters file to the SRC_URI if set
+SRC_URI_append += " ${@paths_affix(d.getVar("MACHINE_XPARAMETERS", True) or '', prefix = 'file://')}"
+
+# Full path to the xparameters.h file
+UBOOT_XPARAMETERS ?= "${@expand_workdir_paths("MACHINE_XPARAMETERS", d)}"
+
 # Install the MicroBlaze System configuration into the board configuration,
 # and generate a u-boot specific config.mk
 do_configure_prepend () {
-        if [ "${SOC_FAMILY}" = "microblaze" -a ! -z "${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_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}
-                        echo "" >> ${CONFIG_MK}
+        if [ "${SOC_FAMILY}" = "microblaze" -a -e "${UBOOT_XPARAMETERS}" ]; then
+                CONFIG_MK=${S}/board/xilinx/microblaze-generic/config.mk
+                cp ${UBOOT_XPARAMETERS} ${S}/board/xilinx/microblaze-generic/xparameters.h
 
-                        # Export CCARGS
-                        for i in ${TUNE_CCARGS}; do
-                                echo "PLATFORM_CPPFLAGS += $i" >> ${CONFIG_MK}
-                        done
+                # Generate the config.mk from CFLAGS and XPARAMETERS file
+                echo "# This file is generated by the meta-xilinx layer." > ${CONFIG_MK}
+                echo "" >> ${CONFIG_MK}
 
-                        echo "" >> ${CONFIG_MK}
+                # Export CCARGS
+                for i in ${TUNE_CCARGS}; do
+                        echo "PLATFORM_CPPFLAGS += $i" >> ${CONFIG_MK}
+                done
+                echo "" >> ${CONFIG_MK}
 
-                        # Calculate the TEXT_BASE address at RAM_END - 4MB
-                        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]")
+                # Calculate the TEXT_BASE address at RAM_END - 4MB
+                RAM_START=$(grep "XILINX_RAM_START" ${UBOOT_XPARAMETERS} | grep -o "0x.*$")
+                RAM_SIZE=$(grep "XILINX_RAM_SIZE" ${UBOOT_XPARAMETERS} | grep -o "0x.*$")
+                BASE_OFFSET=$(printf "0x%08x" "$[$RAM_START + $RAM_SIZE - 0x400000]")
 
-                        echo "TEXT_BASE = $BASE_OFFSET" >> ${CONFIG_MK}
-                        echo "CONFIG_SYS_TEXT_BASE = $BASE_OFFSET" >> ${CONFIG_MK}
-                fi
+                echo "TEXT_BASE = $BASE_OFFSET" >> ${CONFIG_MK}
+                echo "CONFIG_SYS_TEXT_BASE = $BASE_OFFSET" >> ${CONFIG_MK}
         fi
 }