From e74d7fdd6938cb0e28d39074678b0c457bf602de Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@postmarketos.org>
Date: Fri, 15 Aug 2025 20:43:43 +0200
Subject: [PATCH] device-samsung-i9100: use u-boot as intermediate bootloader

The close-to-mainline u-boot fork can then load linux from boot
partition.

One downside is that it will no longer be possible to flash through
pmbootstrap, since there is no support for flashing arbritrary targets
to arbritrary partitions with pmbootstrap, yet.

Therefore, users will need to manually flash
/usr/share/u-boot/trats/u-boot.bin to the KERNEL partition for i9100
to work after these changes.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6921>
---
 device/testing/device-samsung-i9100/APKBUILD   |  5 +++--
 device/testing/device-samsung-i9100/deviceinfo | 10 +++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/device/testing/device-samsung-i9100/APKBUILD b/device/testing/device-samsung-i9100/APKBUILD
index aa0b75fb5..a7ce6b913 100644
--- a/device/testing/device-samsung-i9100/APKBUILD
+++ b/device/testing/device-samsung-i9100/APKBUILD
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9100
-pkgver=11
+pkgver=12
 pkgrel=0
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos4
 	mesa-egl
 	postmarketos-base
+	u-boot-samsung-i9100>=2025.07
 	v4l-utils
 	"
 makedepends="devicepkg-dev"
@@ -42,6 +43,6 @@ openrc() {
 }
 
 sha512sums="
-44d28e6456ca7ace2e0a67f242bf29e6c0459d38e12eda64185530ad8084afff2ef4d0b5e864dce69fbf4f4ae724a9c7223c6d75488877e39280403a5731c546  deviceinfo
+7299545003590d7f060cface4c0e15bfb8234c02f1dedb9aea0c9510b590a7f890a1b3bcb9958e090737613c4bc4305cacd673e7fe0293c179cbc822076ba0d6  deviceinfo
 d3f06476be583f095189557e5269866cfc9346ddbf8d78267d7562fad7f5eca6b09b81fd08cd9690ecf88105bafe8f3ebd9136b68ab5cdaa8bfff740a8bdf3d2  media-pipeline.initd
 "
diff --git a/device/testing/device-samsung-i9100/deviceinfo b/device/testing/device-samsung-i9100/deviceinfo
index fc5f9c6c4..90468a80c 100644
--- a/device/testing/device-samsung-i9100/deviceinfo
+++ b/device/testing/device-samsung-i9100/deviceinfo
@@ -8,8 +8,9 @@ deviceinfo_codename="samsung-i9100"
 deviceinfo_year="2011"
 deviceinfo_append_dtb="true"
 deviceinfo_dtb="exynos4210-i9100"
+deviceinfo_uboot_boardname="trats"
 deviceinfo_getty="ttySAC2;115200"
-deviceinfo_flash_method="heimdall-isorec"
+deviceinfo_flash_method="none"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -19,12 +20,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
-deviceinfo_create_initfs_extra="true"
 
-# Heimdall related
-deviceinfo_flash_heimdall_partition_kernel="KERNEL"
-deviceinfo_flash_heimdall_partition_initfs="RECOVERY"
-deviceinfo_flash_heimdall_partition_rootfs="DATAFS"
+# Bootloader related
 deviceinfo_flash_sparse="true"
-deviceinfo_flash_kernel_on_update="true"
 deviceinfo_kernel_cmdline="console=ttySAC2,115200"