Commit d7d92c00 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

Merge branch 'master' of https://github.com/Elphel/meta-ezynq

parents af945e32 1526bf3b
...@@ -124,6 +124,18 @@ do_deploy_append() { ...@@ -124,6 +124,18 @@ do_deploy_append() {
rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} u-boot-dtb.img rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} u-boot-dtb.img
ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
ln -sf ${UBOOT_IMAGE} u-boot-dtb.img ln -sf ${UBOOT_IMAGE} u-boot-dtb.img
if [ ! -d ${PRODUCTION_DIR} ]; then
mkdir ${PRODUCTION_DIR}
fi
if [ -f ${PRODUCTION_DIR}/${PRODUCTION_BOOT} ]; then
rm ${PRODUCTION_DIR}/${PRODUCTION_BOOT}
fi
cp ${SPL_IMAGE} ${PRODUCTION_DIR}/${PRODUCTION_BOOT}
if [ -f ${PRODUCTION_DIR}/${PRODUCTION_UBOOT} ]; then
rm ${PRODUCTION_DIR}/${PRODUCTION_UBOOT}
fi
cp ${UBOOT_IMAGE} ${PRODUCTION_DIR}/${PRODUCTION_UBOOT}
fi fi
} }
......
...@@ -37,6 +37,8 @@ SRC_URI_ezynq= "git://github.com/Elphel/ezynq.git" ...@@ -37,6 +37,8 @@ SRC_URI_ezynq= "git://github.com/Elphel/ezynq.git"
SRC_URI_ezynq_branch= "jethro" SRC_URI_ezynq_branch= "jethro"
SRC_URI_uboot= "git://git.denx.de/u-boot.git" SRC_URI_uboot= "git://git.denx.de/u-boot.git"
#for u-boot-xlnx
#SRC_URI_uboot= "https://github.com/Xilinx/u-boot-xlnx.git"
SRC_URI_uboot_branch= "master" SRC_URI_uboot_branch= "master"
#SRCREV_ezynq= "83340698f9669977b7205aa67e6ca0dd23fb741f" #SRCREV_ezynq= "83340698f9669977b7205aa67e6ca0dd23fb741f"
...@@ -49,6 +51,8 @@ SRCREV_ezynq= "" ...@@ -49,6 +51,8 @@ SRCREV_ezynq= ""
#SRCREV_uboot= "54fee227ef141214141a226efd17ae0516deaf32" #SRCREV_uboot= "54fee227ef141214141a226efd17ae0516deaf32"
#SRCREV_uboot= "2a0536fa48db1fc5332e3cd33b846d0da0c8bc1e" #SRCREV_uboot= "2a0536fa48db1fc5332e3cd33b846d0da0c8bc1e"
SRCREV_uboot= "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" SRCREV_uboot= "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
#for u-boot-xlnx
#SRCREV_uboot= "01b1fea9b13b799a16efd743587dc861719e5212"
PATCH_NAME= "ezynq.patch" PATCH_NAME= "ezynq.patch"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment