u-boot-xlnx: Add microblaze specific configuration setup

* When the machine being built is microblaze, copy config.mk and
  xparameters.h into board/xilinx/microblaze-generic
* Fixed newlines in file

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

1 files changed, 25 insertions, 13 deletions

diff --git a/recipes-bsp/u-boot/u-boot-extra.inc b/recipes-bsp/u-boot/u-boot-extra.inc
index aa7e6149..f07284a5 100644
--- a/recipes-bsp/u-boot/u-boot-extra.inc
+++ b/recipes-bsp/u-boot/u-boot-extra.inc
@@ -1,13 +1,25 @@
-

-# Also deploy u-boot elf file with same file format as bin file

-SRC_ELF ?= "u-boot"

-DEST_ELF ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"

-ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"

-do_deploy_append() {

-        install ${S}/${SRC_ELF} ${DEPLOYDIR}/${DEST_ELF}

-

-    cd ${DEPLOYDIR}

-    rm -f ${SRC_ELF} ${ELF_SYMLINK}

-    ln -sf ${DEST_ELF} ${ELF_SYMLINK}

-    ln -sf ${DEST_ELF} ${SRC_ELF}.elf

-}
\ No newline at end of file
+
+# Also deploy u-boot elf file with same file format as bin file
+SRC_ELF ?= "u-boot"
+DEST_ELF ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
+ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
+do_deploy_append() {
+        install ${S}/${SRC_ELF} ${DEPLOYDIR}/${DEST_ELF}
+
+        cd ${DEPLOYDIR}
+        rm -f ${SRC_ELF} ${ELF_SYMLINK}
+        ln -sf ${DEST_ELF} ${ELF_SYMLINK}
+        ln -sf ${DEST_ELF} ${SRC_ELF}.elf
+}
+
+# Install the MicroBlaze System configuration into the board configuration
+do_configure_prepend () {
+        if [ "${SOC_FAMILY}" = "microblaze" ]; then
+                if [ -e ${WORKDIR}/config.mk ]; then
+                        cp ${WORKDIR}/config.mk ${S}/board/xilinx/microblaze-generic/
+                fi
+                if [ -e ${WORKDIR}/xparameters.h ]; then
+                        cp ${WORKDIR}/xparameters.h ${S}/board/xilinx/microblaze-generic/
+                fi
+        fi
+}