updated device tree recipe and fixed linux-xlnx (65f8a5dd) · Commits · Elphel / meta-elphel393

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

+11 −9

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,8 @@ FILESEXTRAPATHS_append := "${TOPDIR}/../../linux-elphel/src/arch/arm/boot/dts:"

	MACHINE_DEVICETREE ?= "elphel393.dts"		MACHINE_DEVICETREE ?= "elphel393.dts"

			COMPATIBLE_MACHINE_elphel393 = ".*"

	SRC_URI += "file://${MACHINE_DEVICETREE} \		SRC_URI += "file://${MACHINE_DEVICETREE} \
	file://elphel393-zynq-base.dtsi \		file://elphel393-zynq-base.dtsi \
	file://elphel393-bootargs-mmc.dtsi \		file://elphel393-bootargs-mmc.dtsi \
	@@ -12,11 +14,11 @@ SRC_URI += "file://${MACHINE_DEVICETREE} \
	"		"

	do_deploy(){		do_deploy(){
	for DTS_FILE in ${DEVICETREE}; do		for DTS_FILE in ${S}/devicetree/*.dts; do
	DTS_NAME=`basename ${DTS_FILE} \| awk -F "." '{print $1}'`		DTS_NAME=`basename ${DTS_FILE} \| awk -F "." '{print $1}'`
	for RLOC in ${PRODUCTION_ROOT_LOCATION}; do		for RLOC in ${PRODUCTION_ROOT_LOCATION}; do
	if [ ! -f ${WORKDIR}/${DTS_NAME}_${RLOC}.dtb ]; then		if [ ! -f ${B}/${DTS_NAME}_${RLOC}.dtb ]; then
	echo "Warning: ${WORKDIR}/${DTS_NAME}_${RLOC}.dtb is not available!"		echo "Warning: ${B}/${DTS_NAME}_${RLOC}.dtb is not available!"
	continue		continue
	fi		fi

	@@ -49,7 +51,7 @@ do_compile() {
	done		done
	fi		fi

	for DTS_FILE in ${DEVICETREE}; do		for DTS_FILE in ${S}/devicetree/*.dts; do
	DTS_NAME=`basename ${DTS_FILE} \| awk -F "." '{print $1}'`		DTS_NAME=`basename ${DTS_FILE} \| awk -F "." '{print $1}'`
	for RLOC in ${PRODUCTION_ROOT_LOCATION}; do		for RLOC in ${PRODUCTION_ROOT_LOCATION}; do
	ln -sf ${WORKDIR}/devicetree/elphel393-bootargs-${RLOC}.dtsi ${WORKDIR}/devicetree/elphel393-bootargs.dtsi		ln -sf ${WORKDIR}/devicetree/elphel393-bootargs-${RLOC}.dtsi ${WORKDIR}/devicetree/elphel393-bootargs.dtsi
	@@ -60,10 +62,10 @@ do_compile() {

	# full sub		# full sub
	do_install() {		do_install() {
	for DTS_FILE in ${DEVICETREE}; do		for DTS_FILE in ${S}/devicetree/*.dts; do
	DTS_NAME=`basename ${DTS_FILE} \| awk -F "." '{print $1}'`		DTS_NAME=`basename ${DTS_FILE} \| awk -F "." '{print $1}'`
	for RLOC in ${PRODUCTION_ROOT_LOCATION}; do		for RLOC in ${PRODUCTION_ROOT_LOCATION}; do
	if [ ! -f ${WORKDIR}/${DTS_NAME}_${RLOC}.dtb ]; then		if [ ! -f ${B}/${DTS_NAME}_${RLOC}.dtb ]; then
	echo "Warning: ${DTS_NAME}_${RLOC}.dtb is not available!"		echo "Warning: ${DTS_NAME}_${RLOC}.dtb is not available!"
	continue		continue
	fi		fi

recipes-kernel/linux/linux-xlnx_2017.3.bbappend

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -94,20 +94,25 @@ do_deploy_append(){
	mkdir -p ${DEPLOY_DIR_IMAGE}/${RLOC}		mkdir -p ${DEPLOY_DIR_IMAGE}/${RLOC}
	fi		fi
	#if [ -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ]; then		#if [ -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ]; then
	if [ -f ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin ]; then
			# ROCKO: "uImage-" had to be added?!

			if [ -f ${DEPLOYDIR}/uImage-${KERNEL_IMAGE_BASE_NAME}.bin ]; then
	if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then		if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then
	rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}		rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
	fi		fi
	cp ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}		cp ${DEPLOYDIR}/uImage-${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
	else		else
	echo "NOT 3 FOUND!"		echo "NOT 3 FOUND!"
	fi		fi
	#copy initramfs image over initramfsless image
	if [ -f ${DEPLOYDIR}/${INITRAMFS_BASE_NAME}.bin ]; then		# copy initramfs image over initramfsless image - why?

			if [ -f ${DEPLOYDIR}/uImage-${INITRAMFS_BASE_NAME}.bin ]; then
	if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then		if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then
	rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}		rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
	fi		fi
	cp ${DEPLOYDIR}/${INITRAMFS_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}		cp ${DEPLOYDIR}/uImage-${INITRAMFS_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
	fi		fi
	done		done
	}		}