From c293b036427c2f2b6d2b821a3a4d31fd8b070662 Mon Sep 17 00:00:00 2001 From: Affe Null Date: Sat, 25 Feb 2023 15:16:12 +0100 Subject: [PATCH] samsung-t0lte: add panel selection (MR 3549) Let the user select between two kernel variants using the different device trees for the different panel variants (ea8061 and s6evr02) [ci:skip-build]: Already built successfully in CI --- device/testing/device-samsung-t0lte/APKBUILD | 25 +++++++++++++++---- .../testing/device-samsung-t0lte/deviceinfo | 3 ++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/device/testing/device-samsung-t0lte/APKBUILD b/device/testing/device-samsung-t0lte/APKBUILD index d0c74150e..63f716345 100644 --- a/device/testing/device-samsung-t0lte/APKBUILD +++ b/device/testing/device-samsung-t0lte/APKBUILD @@ -1,21 +1,24 @@ # Reference: pkgname=device-samsung-t0lte pkgdesc="Samsung Galaxy Note II LTE" -pkgver=0.4 -pkgrel=1 +pkgver=0.5 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" alsa-ucm-conf - linux-postmarketos-exynos4 mkbootimg postmarketos-base soc-samsung-exynos4412-haptics " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" +subpackages=" + $pkgname-nonfree-firmware:nonfree_firmware + $pkgname-kernel-s6evr02:kernel_s6evr02 + $pkgname-kernel-ea8061:kernel_ea8061 +" source=" deviceinfo ucm/Midas.conf @@ -46,8 +49,20 @@ nonfree_firmware() { mkdir "$subpkgdir" } +kernel_s6evr02() { + pkgdesc="Samsung S6EVR02 panel. To know which panel your device uses, see the wiki page of the 3G version, https://wiki.postmarketos.org/wiki/Samsung_Galaxy_Note_II_(samsung-t03g)" + depends="linux-postmarketos-exynos4" + devicepkg_subpackage_kernel "$startdir" "$pkgname" "$subpkgname" +} + +kernel_ea8061() { + pkgdesc="Magnachip EA8061 panel. To know which panel your device uses, see the wiki page of the 3G version, https://wiki.postmarketos.org/wiki/Samsung_Galaxy_Note_II_(samsung-t03g)" + depends="linux-postmarketos-exynos4" + devicepkg_subpackage_kernel "$startdir" "$pkgname" "$subpkgname" +} + sha512sums=" -a2a1742e4868fb153b538c2340f3b5e25e31dae761bf07c8713a1b845b3c49a730d82c78636a998789fcbcc947ad819a9919ac9d3dc88b18c7ffb80419d18551 deviceinfo +ae63b78724e6afbfb0a3455d317f68b7a4db796f6657ea66befd155299b145e66e716ed71e34f17968f73137a2e3e286c165442029e603a74055208f74c0e182 deviceinfo caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc Midas.conf a56ce19331a8997b1cc493b8ab6b16ecfc423254a380e13a9461ec94ec5bc124cb3283256ef8cc014db60937a5e7404c6f7728bc2cc2494a70c612ccb3fd4105 HiFi.conf 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051 modules-load.conf diff --git a/device/testing/device-samsung-t0lte/deviceinfo b/device/testing/device-samsung-t0lte/deviceinfo index 18a1875de..ba046de43 100644 --- a/device/testing/device-samsung-t0lte/deviceinfo +++ b/device/testing/device-samsung-t0lte/deviceinfo @@ -7,7 +7,8 @@ deviceinfo_manufacturer="Samsung" deviceinfo_codename="samsung-t0lte" deviceinfo_year="2012" deviceinfo_append_dtb="true" -deviceinfo_dtb="exynos4412-n710x" +deviceinfo_dtb_s6evr02="exynos4412-n710x-s6evr02" +deviceinfo_dtb_ea8061="exynos4412-n710x-ea8061" deviceinfo_arch="armv7" # Device related