[gnome-build-meta] Try to fix genimage error by deleting partition-type in config. Update config.txt content to be refr

[Abderrahim Kitouni <akitouni src gnome org>]

commit 17774bf79e96a21965f47b63230f981a6ef89255
Author: Robin Verdenal-Tallieux <allomix302 gmail com>
Date:   Mon Oct 3 17:45:23 2022 +0000

    Try to fix genimage error by deleting partition-type in config.
    Update config.txt content to be refreshed with better performance.
    Change firmware source from git_tag to tar (useless to download the entire repo as we just want some 
binaries which are not updated)
    Update u-boot source to latest.
    Add new dtbo to allow pi 400 to boot.
    Switch from fkms to kms.

 elements/boards/raspberrypi-4/bsp/firmware.bst |  6 ++----
 elements/boards/raspberrypi-4/bsp/u-boot.bst   |  2 +-
 elements/boards/raspberrypi-4/image.bst        | 16 +++++++---------
 files/boards/raspberrypi-4/boot.script         |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/elements/boards/raspberrypi-4/bsp/firmware.bst b/elements/boards/raspberrypi-4/bsp/firmware.bst
index 1e7819240..3ddfcade3 100644
--- a/elements/boards/raspberrypi-4/bsp/firmware.bst
+++ b/elements/boards/raspberrypi-4/bsp/firmware.bst
@@ -6,10 +6,8 @@ build-depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 sources:
-- kind: git_tag
-  url: github:raspberrypi/firmware.git
-  track: 20354bebcc2a8448128f2348e19e155910d25122
-  track-tags: false
+- kind: tar
+  url: github_files:raspberrypi/firmware/archive/refs/tags/1.20220830.tar.gz
 
 config:
   install-commands:
diff --git a/elements/boards/raspberrypi-4/bsp/u-boot.bst b/elements/boards/raspberrypi-4/bsp/u-boot.bst
index 9d1f67e30..0ac852612 100644
--- a/elements/boards/raspberrypi-4/bsp/u-boot.bst
+++ b/elements/boards/raspberrypi-4/bsp/u-boot.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://ftp.denx.de/pub/u-boot/u-boot-2020.07-rc2.tar.bz2
+  url: https://ftp.denx.de/pub/u-boot/u-boot-2022.07.tar.bz2 
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/boards/raspberrypi-4/image.bst b/elements/boards/raspberrypi-4/image.bst
index 16d49b1fc..ab8e88140 100644
--- a/elements/boards/raspberrypi-4/image.bst
+++ b/elements/boards/raspberrypi-4/image.bst
@@ -80,21 +80,20 @@ config:
 
   # The dtb seems to be required by the firmware to be able to load u-boot
   - |
-    cp -r "/kernel/boot/dtbs/broadcom/bcm2711-rpi-4-b.dtb" "%{sysroot}/boot/"
+    cp -r "/kernel/boot/dtbs/broadcom/bcm2711*" "%{sysroot}/boot/"
 
   # 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
-    enable_uart=1
-    start_x=1
-    # FIXME: We should maybe try to load fdt and overlays from u-boot
-    device_tree_address=0x02600000
-    dtoverlay=vc4-fkms-v3d
     dtparam=audio=on
+    arm_boost=1
+    arm_64bit=1
+    disable_overscan=1
+    dtoverlay=vc4-kms-v3d-pi4
     EOF
 
   - |
@@ -116,12 +115,11 @@ config:
     }
     image disk.img {
         hdimage {
-            gpt = true
+            partition-table-type = "gpt"
             align = 1M
         }
         partition efi {
             image = "efi.img"
-            partition-type = 0x0c
             bootable = true
             partition-type-uuid = "U"
         }
diff --git a/files/boards/raspberrypi-4/boot.script b/files/boards/raspberrypi-4/boot.script
index 11e3f43e9..e0fa46de8 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};