Commit a2dbada0 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

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

parents 72c90919 7d11444c

conf/machine/elphel393.conf

+2 −3
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ UBOOT_MACHINE = "elphel393_config" 


SERIAL_CONSOLE = "115200 ttyPS0"



MACHINE_DEVICETREE := "\

                       elphel393/elphel393.dts \

                      "

MACHINE_DEVICETREE ?= "elphel393.dts"



MACHINE_KCONFIG := "common/elphel393_defconfig_${LINUX_VERSION}"



#hostname - applied to rootfs image

recipes-bsp/device-tree/device-tree.bbappend

+7 −8
Original line number Diff line number Diff line
@@ -2,17 +2,15 @@ 


FILESEXTRAPATHS_append := "${TOPDIR}/../../linux-elphel/src/arch/arm/boot/dts:"



SRC_URI += "file://elphel393.dts \

MACHINE_DEVICETREE ?= "elphel393.dts"



SRC_URI += "file://${MACHINE_DEVICETREE} \

            file://elphel393-zynq-base.dtsi \

            file://elphel393-bootargs-mmc.dtsi \

            file://elphel393-bootargs-nand.dtsi \

            file://elphel393-bootargs-ram.dtsi \

            "



MACHINE_DEVICETREE := "\

                       elphel393.dts \

                      "



do_deploy(){

	for DTS_FILE in ${DEVICETREE}; do

		DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
@@ -33,7 +31,7 @@ do_deploy(){ 
				rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE}

			fi

			

			cp ${DEPLOY_DIR_IMAGE}/${MACHINE}_${RLOC}.dtb ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE}

			cp ${DEPLOY_DIR_IMAGE}/${DTS_NAME}_${RLOC}.dtb ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE}

		done

	done

}
@@ -81,8 +79,9 @@ REMOTE_IP ??= "192.168.0.9" 


do_target_scp () {

    # mmc device tree only

    echo "scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/${MACHINE}_mmc.dtb ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc/devicetree.dtb"

    scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/${MACHINE}_mmc.dtb ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc/devicetree.dtb

    echo "scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/mmc/devicetree.dtb ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc"

    scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/mmc/devicetree.dtb ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc

    ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} sync

}



addtask do_target_scp after do_deploy

recipes-kernel/linux/linux-xlnx_4.0.bbappend

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ REMOTE_IP ??= "192.168.0.9" 
do_target_scp () {

    echo "scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc/${PRODUCTION_KERNEL}"

    scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/mmc/${PRODUCTION_KERNEL} ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc/${PRODUCTION_KERNEL}

    ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} sync

}



addtask do_target_scp after do_deploy