From 42fda5098bb03c8c6054726f614d581c6eea3efb Mon Sep 17 00:00:00 2001
From: Thiago Foganholi <thiagaoplusplus@outlook.com>
Date: Sun, 18 Oct 2020 20:35:25 -0300
Subject: [PATCH] samsung-i9305: Add multiple-kernel configuration (MR 1634)

With a new mainline kernel package available for this device, add a new
package dependency and allow the user to choose downstream or mainline
kernel.
---
 device/testing/device-samsung-i9305/APKBUILD  | 30 ++++++++++++++-----
 .../device-samsung-i9305.post-install         |  2 +-
 .../testing/device-samsung-i9305/deviceinfo   | 29 ++++++++++--------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/device/testing/device-samsung-i9305/APKBUILD b/device/testing/device-samsung-i9305/APKBUILD
index 353e206ae..734614a2a 100644
--- a/device/testing/device-samsung-i9305/APKBUILD
+++ b/device/testing/device-samsung-i9305/APKBUILD
@@ -1,20 +1,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9305
-pkgver=1
-pkgrel=27
 pkgdesc="Samsung Galaxy SIII LTE"
+pkgver=1
+pkgrel=28
 url="https://postmarketos.org"
-arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-samsung-i9305 mkbootimg mesa-dri-swrast"
+arch="armv7"
+options="!check !archcheck"
+depends="postmarketos-base mkbootimg mesa-dri-gallium"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
 "
-options="!check !archcheck"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,11 +30,23 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+kernel_downstream() {
+	pkgdesc="Display and wifi works (see device table for details)"
+	depends="linux-samsung-i9305"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="For kernel development only (most features aren't working)"
+	depends="linux-postmarketos-exynos4"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-samsung-i9305"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="08b1afd30769b9d958713bf60d928212f338ed3b84e72663f6a239b67e7a3738275c38dccb4fce2c880af41b9354058b85f4b597ef9f36cc16c987c29ff14a21  deviceinfo
+sha512sums="02e3cd88ae7d3f4af22cb3fb007d0eef931328dd1575677bca4bfbe735f25a2c74e44ba12be54fd4c7ad8c1b192b3035ff629cef56259c81d642d1b591d02ac4  deviceinfo
 d70a03210458c771f94db920a8d3162a03fc7727f0fbafef4c1575ebc659c937c082f5c7a4dcdd1572925b973d628c6f4cf895c3b8b2a59af8142824468fe7c4  90-android-touch-dev.rules"
diff --git a/device/testing/device-samsung-i9305/device-samsung-i9305.post-install b/device/testing/device-samsung-i9305/device-samsung-i9305.post-install
index ddeb08240..19f768c2f 100644
--- a/device/testing/device-samsung-i9305/device-samsung-i9305.post-install
+++ b/device/testing/device-samsung-i9305/device-samsung-i9305.post-install
@@ -3,5 +3,5 @@
 # Create mount point and /efs mount point in fstab
 if [ -z "$(grep /efs /etc/fstab)" ]; then
 	mkdir -p /efs
-	echo "/dev/mmcblk0p1	/efs	auto	ro	0	0" >> /etc/fstab
+	echo "/dev/mmcblk0p1	/efs	noauto	ro	0	0" >> /etc/fstab
 fi
diff --git a/device/testing/device-samsung-i9305/deviceinfo b/device/testing/device-samsung-i9305/deviceinfo
index 86b21462c..58a634ff3 100644
--- a/device/testing/device-samsung-i9305/deviceinfo
+++ b/device/testing/device-samsung-i9305/deviceinfo
@@ -6,27 +6,32 @@ deviceinfo_name="Samsung Galaxy SIII LTE"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-i9305"
 deviceinfo_year="2012"
-deviceinfo_dtb=""
+deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb_mainline="exynos4412-i9305"
 deviceinfo_modules_initfs=""
-deviceinfo_external_storage="true"
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_generate_bootimg="true"
 deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
-deviceinfo_dev_touchscreen="/dev/input/event2"
 
-# Offsets for the boot.img
-deviceinfo_kernel_cmdline="console=ttySAC2,115200 buildvariant=userdebug"
-deviceinfo_flash_offset_kernel=0x00008000
-deviceinfo_flash_offset_ramdisk=0x1000000
-deviceinfo_flash_offset_second=0x00f00000
-deviceinfo_flash_offset_tags=0x00000100
-deviceinfo_flash_pagesize=2048
+# Bootloader related 
+deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_kernel_cmdline_downstream="console=ttySAC2,115200 buildvariant=userdebug"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x10000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
 
 # Heimdall related
 deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_flash_heimdall_partition_system=""