From 95fe04886c61b72ac43157a79c201949d3aef1dc Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@postmarketos.org>
Date: Tue, 22 Apr 2025 15:56:02 +0200
Subject: [PATCH] device-samsung-m3: use msdos partition type

If a custom bl1 is used on sdcard, then it should be embedded at
0x200 (512). If a GPT filesystem is used, then the GPT header uses
roughly the first 0x500 bytes, and hence bl1 overwrites part of the
GPT header in that configuration.

Change to msdos partition type so that the filesystem works fine
whether or not we use stock bl1 or custom one.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6442
---
 device/testing/device-samsung-m3/APKBUILD   | 4 ++--
 device/testing/device-samsung-m3/deviceinfo | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/device/testing/device-samsung-m3/APKBUILD b/device/testing/device-samsung-m3/APKBUILD
index 4a06384d7..12250f080 100644
--- a/device/testing/device-samsung-m3/APKBUILD
+++ b/device/testing/device-samsung-m3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Henrik Grimler <henrik@grimler.se>
 pkgname=device-samsung-m3
 pkgdesc="Samsung Galaxy S III LTE"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -53,7 +53,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-7f13c7960a9a68af17a31361d6eab8a54bcf3ecdc14473938e467d0889e7992913481d1fee3e509dbd9ecd35103d680af5769806ffb35356af77231f33b6212d  deviceinfo
+7b004bf4210adce30c8cac664688ca164353eb5747c132ff4b6d7efcbc393fadd08719202aa3d96f67bcab5734f0d2011ad2e0f4b1bcacebd137ab7e2ffba8cb  deviceinfo
 caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
 21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf
diff --git a/device/testing/device-samsung-m3/deviceinfo b/device/testing/device-samsung-m3/deviceinfo
index f6d8d8b72..cb5b0bb7f 100644
--- a/device/testing/device-samsung-m3/deviceinfo
+++ b/device/testing/device-samsung-m3/deviceinfo
@@ -36,3 +36,6 @@ deviceinfo_flash_pagesize="2048"
 
 # Heimdall related
 deviceinfo_flash_heimdall_partition_kernel="BOOT"
+# If we use u-boot + custom bl1 embedded in sdcard, then bl1 location
+# conflicts with GPT header, so use msdos.
+deviceinfo_partition_type="msdos"