X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-raspberrypi%2Frecipes-kernel%2Fcreate-combined-dtb%2Fcreate-combined-dtb_1.0.0.bb;h=c82e6fd228e4e419f764ddf51aa48ee35f9d8811;hb=refs%2Fheads%2Fmaster;hp=bed3062eea1c2d61777f4706a79c5e16b2d7956e;hpb=50a2eecc8e61647a2a5142a154232fe87fdd37f9;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb
index bed3062ee..c5edbe1dc 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb
@@ -7,29 +7,37 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 DEPENDS = "dtc-native"
 
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
 
 S = "${WORKDIR}"
 
 do_compile[depends] += "virtual/kernel:do_deploy"
 
 do_compile () {
-	# Official touchscreen setup (rpi3b/rpi3b dtb, vc4-kms-v3d and ft5406)
-	fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo ${DEPLOY_DIR_IMAGE}/rpi-backlight.dtbo ${DEPLOY_DIR_IMAGE}/rpi-7inch.dtbo
-	fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo ${DEPLOY_DIR_IMAGE}/rpi-backlight.dtbo ${DEPLOY_DIR_IMAGE}/rpi-7inch.dtbo
+	# Plain VC4 (HDMI)
+	if [ -f "${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb" ]; then
+		fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb -o bcm2711-rpi-4-b+vc4.dtb \
+			${DEPLOY_DIR_IMAGE}/${VC4DTBO}-pi4.dtbo
+	fi
+
+	# VC4 + LCD
+	if [ -f "${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb" -a -f "${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo" ]; then
+		fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb -o bcm2711-rpi-4-b+vc4+ft5406.dtb \
+			${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo \
+			${DEPLOY_DIR_IMAGE}/${VC4DTBO}-pi4.dtbo
+	fi
 
-	# HDMI screen setup (rpi3b/rpi3b dtb and vc4-kms-v3d)
-	fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo
-	fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3+vc4.dtb ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo
 }
 
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 ${S}/bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}
-	install -m 0644 ${S}/bcm2710-rpi-3+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}
-	install -m 0644 ${S}/bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE}
-	install -m 0644 ${S}/bcm2710-rpi-3+vc4.dtb ${DEPLOY_DIR_IMAGE}
+	if [ -f "${S}/bcm2711-rpi-4-b+vc4+ft5406.dtb" ]; then
+		install -m 0644 ${S}/bcm2711-rpi-4-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}
+	fi
+	if [ -f "${S}/bcm2711-rpi-4-b+vc4.dtb" ]; then
+		install -m 0644 ${S}/bcm2711-rpi-4-b+vc4.dtb ${DEPLOY_DIR_IMAGE}
+	fi
 }
 
 addtask deploy after do_install