From b6500ad95d817b80629776f72f4dfedfe77812e0 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Mon, 12 Dec 2022 13:55:54 +0100
Subject: [PATCH] Fix image creation scripts

---
 .../board/raspberrypi/config_3_64bit.txt      |  4 ++--
 .../raspberrypi/genimage-raspberrypi3-64.cfg  | 22 +++++++++++++++----
 .../board/raspberrypi3-64/cmdline.txt         |  1 -
 .../board/raspberrypi3-64/config.txt          |  1 -
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 120000 buildroot-external/board/raspberrypi3-64/cmdline.txt
 delete mode 120000 buildroot-external/board/raspberrypi3-64/config.txt

diff --git a/buildroot-external/board/raspberrypi/config_3_64bit.txt b/buildroot-external/board/raspberrypi/config_3_64bit.txt
index b065d979..ade40bcb 100644
--- a/buildroot-external/board/raspberrypi/config_3_64bit.txt
+++ b/buildroot-external/board/raspberrypi/config_3_64bit.txt
@@ -5,8 +5,8 @@
 # and http://elinux.org/RPiconfig for a description of config.txt syntax
 # We always use the same names, the real used variant is selected by
 # BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice
-start_file=startx.elf
-fixup_file=fixupx.dat
+start_file=start_x.elf
+fixup_file=fixup_x.dat
 
 kernel=Image
 
diff --git a/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg b/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg
index 135a8c94..33cfed03 100644
--- a/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg
+++ b/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -17,7 +17,15 @@ image boot.vfat {
       "Image"
     }
   }
-  size = 96M
+  size = 64M
+}
+
+image overlayfs.ext4 {
+  name = "overlayfs"
+  ext4 {
+    use-mke2fs = "true"
+  }
+  size = 64M
 }
 
 image sdcard.img {
@@ -26,7 +34,7 @@ image sdcard.img {
     partition-table-type = "hybrid"
   }
 
-  partition boot1 {
+  partition boot {
     partition-type = 0xC
     partition-uuid = 9262aee5-2d23-4e09-baac-280591e2e834
     partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
@@ -34,9 +42,15 @@ image sdcard.img {
     image = "boot.vfat"
   }
 
-  partition rootfs1 {
+  partition rootfs {
     partition-uuid = c0932a41-44cf-463b-8152-d43188553ed4
     partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
-    image = "rootfs.ext4"
+    image = "rootfs.squashfs"
+  }
+
+  partition overlayfs {
+    partition-uuid = f1326040-5236-40eb-b683-aaa100a9afcf
+    partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4
+    image = "overlayfs.ext4"
   }
 }
diff --git a/buildroot-external/board/raspberrypi3-64/cmdline.txt b/buildroot-external/board/raspberrypi3-64/cmdline.txt
deleted file mode 120000
index e684d0d9..00000000
--- a/buildroot-external/board/raspberrypi3-64/cmdline.txt
+++ /dev/null
@@ -1 +0,0 @@
-../raspberrypi/cmdline.txt
\ No newline at end of file
diff --git a/buildroot-external/board/raspberrypi3-64/config.txt b/buildroot-external/board/raspberrypi3-64/config.txt
deleted file mode 120000
index a08512ea..00000000
--- a/buildroot-external/board/raspberrypi3-64/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-../raspberrypi/config.txt
\ No newline at end of file