meta-agl-bsp: Update Raspberry Pi create-combined-dtb recipe

Update the create-combined-dtb recipe that creates merged dtb files
for netbooting on the Pi 4 to handle the upstream kernel change to a
separate Pi 4 specific version of the vc4-kms-v3d overlay (it now
needs vc4-kms-v3d-pi4.dtbo).  Also remove the Pi 3 support, as AGL
no longer supports it.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I1c331dc3a752e3cc778d40f59dae693b60d5fc96

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 bcb92b2..c5edbe1 100644 (file)
--- 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
@@ -15,28 +15,19 @@ S = "${WORKDIR}"
 do_compile[depends] += "virtual/kernel:do_deploy"
 
 do_compile () {
-       # Official touchscreen setup (rpi3b/rpi3b dtb, VC4DTBO and ft5406)
-       if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb" ]; then
-               fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b-plus+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo
-       fi
-       if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb" ]; then
-               fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.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
-       # NOTE: meta-updater currently disables rpi-ft5406.dtbo on rpi4, so need to check if it is present
+
+       # 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}.dtbo
+               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 VC4DTBO)
-       if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb" ]; then
-               fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b-plus+vc4.dtb ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo
-       fi
-       if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb" ]; then
-               fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo
-       fi
-       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}.dtbo
-       fi
 }
 
 do_deploy () {
@@ -44,21 +35,9 @@ do_deploy () {
        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}/bcm2710-rpi-3-b+vc4+ft5406.dtb" ]; then
-               install -m 0644 ${S}/bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}
-       fi
-       if [ -f "${S}/bcm2710-rpi-3+vc4+ft5406.dtb" ]; then
-               install -m 0644 ${S}/bcm2710-rpi-3+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
-       if [ -f "${S}/bcm2710-rpi-3-b+vc4.dtb" ]; then
-               install -m 0644 ${S}/bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE}
-       fi
-       if [ -f "${S}/bcm2710-rpi-3+vc4.dtb" ]; then
-               install -m 0644 ${S}/bcm2710-rpi-3+vc4.dtb ${DEPLOY_DIR_IMAGE}
-       fi
 }
 
 addtask deploy after do_install