[gnome-build-meta/tpollard/pi4-kms: 11/11] Test full vc4 with latest 5.4 kernel & firmware

[Tom Pollard <tpollard src gnome org>]

commit 8d5ac64d9f85d4ec45c5581fc56fa7a9c4cd79f2
Author: Tom Pollard <tom pollard codethink co uk>
Date:   Thu Jun 11 13:52:22 2020 +0100

    Test full vc4 with latest 5.4 kernel & firmware

 elements/boards/raspberrypi-4/bsp/firmware.bst | 2 +-
 elements/boards/raspberrypi-4/bsp/linux.bst    | 2 +-
 elements/boards/raspberrypi-4/image.bst        | 4 ++--
 files/boards/raspberrypi-4/boot.script         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/elements/boards/raspberrypi-4/bsp/firmware.bst b/elements/boards/raspberrypi-4/bsp/firmware.bst
index 2e9779ac..0154f0ab 100644
--- a/elements/boards/raspberrypi-4/bsp/firmware.bst
+++ b/elements/boards/raspberrypi-4/bsp/firmware.bst
@@ -8,7 +8,7 @@ build-depends:
 sources:
 - kind: git_tag
   url: https://github.com/raspberrypi/firmware
-  track: 20354bebcc2a8448128f2348e19e155910d25122
+  track: a833d278ef38265090d7ea679027331556dc4b2c
   track-tags: false
 
 config:
diff --git a/elements/boards/raspberrypi-4/bsp/linux.bst b/elements/boards/raspberrypi-4/bsp/linux.bst
index f3df5b4c..2c10374e 100644
--- a/elements/boards/raspberrypi-4/bsp/linux.bst
+++ b/elements/boards/raspberrypi-4/bsp/linux.bst
@@ -5,7 +5,7 @@ sources:
   url: github_com:raspberrypi/linux.git
   # Aim to track 5.4 LTS work for vc4-kms etc
   # track: 5.4.y
-  track: a98ba9221895e03b8736312ce6666005da5968a1
+  track: dec0ddc506ab5d93a7de4b8a7c8dc98e0a96f85c
   track-tags: false
 
 depends:
diff --git a/elements/boards/raspberrypi-4/image.bst b/elements/boards/raspberrypi-4/image.bst
index df79a4b4..9352aea6 100644
--- a/elements/boards/raspberrypi-4/image.bst
+++ b/elements/boards/raspberrypi-4/image.bst
@@ -85,7 +85,7 @@ config:
   # FIXME: We should try to load the overlay from u-boot instead.
   - |
     mkdir -p "%{sysroot}/boot/overlays"
-    cp -r "/kernel/boot/dtbs/overlays/vc4-fkms-v3d.dtbo" "%{sysroot}/boot/overlays/"
+    cp -r "/kernel/boot/dtbs/overlays/vc4-kms-v3d-pi4.dtbo" "%{sysroot}/boot/overlays/"
 
   - |
     cat >"%{sysroot}/boot/config.txt" <<EOF
@@ -93,7 +93,7 @@ config:
     start_x=1
     # FIXME: We should maybe try to load fdt and overlays from u-boot
     device_tree_address=0x02600000
-    dtoverlay=vc4-fkms-v3d
+    dtoverlay=vc4-kms-v3d-pi4
     dtparam=audio=on
     EOF
 
diff --git a/files/boards/raspberrypi-4/boot.script b/files/boards/raspberrypi-4/boot.script
index 11e3f43e..e0fa46de 100644
--- a/files/boards/raspberrypi-4/boot.script
+++ b/files/boards/raspberrypi-4/boot.script
@@ -3,7 +3,7 @@
 #load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} /dtb/${fdtfile};
 #fdt addr ${fdt_addr_r};
 #fdt resize 8192;
-#load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /dtb/overlays/vc4-fkms-v3d.dtbo;
+#load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /dtb/overlays/vc4-kms-v3d-pi4.dtbo;
 #fdt apply ${ramdisk_addr_r};
 #load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /dtb/overlays/miniuart-bt.dtbo;
 #fdt apply ${ramdisk_addr_r};