device-samsung-expressatt: Use lk2nd and linux-next

The following has changed:
- use lk2nd instead of heimdall
- use linux-next
- drop msm8960 pmOS kernel

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6133
[ci:skip-build]: already built successfully in CI

device/testing/device-samsung-expressatt/APKBUILD

@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-expressatt
 pkgdesc="Samsung Galaxy Express SGH-I437"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-msm8960 mkbootimg"
+depends="postmarketos-base linux-next mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -21,5 +21,5 @@ package() {
 
 
 sha512sums="
-e0884e5403c774c8609607f9158895028cf04a000df1f0d8054e22258e42f404671fc39ead2978d16d84c08c5f3f4136bed1e03a4dba4e1422351cda5f46f074  deviceinfo
+29e784303698fe1dc56a9d952cb2081527efb4422d5e729e622a2db51274e65c7a612ba331acfbfa04529f77bbc62896f018d2cdd98bd8cc64900d306c4a07d7  deviceinfo
 "

device/testing/device-samsung-expressatt/deviceinfo

@@ -2,7 +2,7 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_dtb="qcom-msm8960-samsung-expressatt"
-deviceinfo_append_dtb="true"
+deviceinfo_append_dtb="false"
 
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy Express SGH-I437"
@@ -19,8 +19,8 @@ deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 
 # Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="androidboot.hardware=qcom user_debug=31 zcache androidboot.bootdevice=msm_sdcc.1"
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon clk_ignore_unused console=ttyMSM0,115200 pd_ignore_unused regulator_ignore_unused"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
@@ -30,4 +30,11 @@ deviceinfo_flash_offset_ramdisk="0x01500000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_flash_fastboot_partition_kernel="system"
+deviceinfo_flash_fastboot_partition_system="userdata"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
+
+deviceinfo_getty="ttyMSM0;115200"

device/testing/linux-next/APKBUILD

@@ -6,8 +6,16 @@ pkgver=6.15_git20250512
 pkgrel=0
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
-arch="aarch64"
-_carch="arm64"
+arch="armv7 aarch64"
+case "$CARCH" in
+	aarch64) _carch="arm64";_defconfig="defconfig";;
+	# FIXME: We should not be using qcom_defconfig. Instead we should be using multi_v7_defconfig.
+	# The problem is two-fold:
+	# - We need to reduce the amount of mainline kernels.
+	# - We need to find a way to not duplicate upstream defconfigs into our repo.
+	# Please see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6133#note_468011
+	armv7) _carch="arm";_defconfig="qcom_defconfig";;
+esac
 _flavor="generic-trailblazer"
 url="https://kernel.org"
 license="GPL-2.0-only"
@@ -28,6 +36,7 @@ makedepends="
 	git
 	openssl-dev
 	perl
+	postmarketos-installkernel
 	python3
 	zstd
 "
@@ -42,7 +51,7 @@ prepare() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-next-$_nextver" \
-		defconfig pmos.config devices.config
+		"$_defconfig" pmos.config devices.config
 }
 
 build() {
@@ -52,10 +61,14 @@ build() {
 }
 
 package() {
-	install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz.efi" \
+	if [ "$CARCH" != "armv7" ]; then
+		install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz.efi" \
 			"$pkgdir/boot/linux.efi"
+	fi
 
-	make modules_install dtbs_install \
+	mkdir -p "$pkgdir"/boot
+
+	make zinstall modules_install dtbs_install \
 		ARCH="$_carch" \
 		INSTALL_PATH="$pkgdir"/boot/ \
 		INSTALL_MOD_PATH="$pkgdir" \
@@ -70,6 +83,6 @@ package() {
 
 sha512sums="
 5634cf65e73c3517aeefde06cbd1b10d020da318262e9808f8471ed2af3a60d568f2b3263e570eb3d56a0e7cca7070740c13cf0823ba92ad9759fc35985a49e7  linux-next-next-20250512.tar.gz
-95b1da5657af138ef97022c9f64987e765bfee634f8b967530dc7126f664039984dc2c2d20abb131fc119794fed25394b235bfc0c18390a45fd782bbaab63dba  devices.config
+094f414e291894d8014088d89d0843a545fc09f896733da1a451b6badc05611b38ed3310f51981e8faebcd1de3b0aa2f2b1728007004125d810339cd17f19b62  devices.config
 8d695fd4616354b224cf9862832ae95deb9647793e3454a136d655a143a00244d65b303b8b8540f65e693f6895576e1b51e18a8c42642f7f5e9331c21fbedbc1  pmos.config
 "

device/testing/linux-next/devices.config

@@ -62,3 +62,7 @@ CONFIG_VIDEO_SUN8I_DEINTERLACE=m
 CONFIG_VIDEO_SUN8I_ROTATE=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=m
+
+# msm8960
+# expressatt
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m

device/testing/linux-postmarketos-qcom-msm8960/APKBUILD

@@ -1,54 +0,0 @@
-# Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: qcom_apq8064_defconfig
-
-_flavor="postmarketos-qcom-msm8960"
-pkgname=linux-$_flavor
-pkgver=6.5_rc2
-pkgrel=3
-pkgdesc="Mainline kernel fork for Qualcomm APQ8064/MSM8960 devices"
-arch="armv7"
-_carch="arm"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="bison flex openssl-dev perl gmp-dev mpc1-dev mpfr-dev findutils postmarketos-installkernel"
-
-# Source
-_repository="linux"
-_config="config-$_flavor.$arch"
-_tag="fdf0eaf11452d72945af31804e2a1048ee1b574c"
-source="
-	$pkgname-$_tag.tar.gz::https://github.com/torvalds/$_repository/archive/$_tag.tar.gz
-	$_config
-"
-builddir="$srcdir/$_repository-$_tag"
-
-prepare() {
-	default_prepare
-	cp -v "$srcdir"/$_config .config
-}
-
-build() {
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	mkdir -p "$pkgdir"/boot
-	make zinstall modules_install dtbs_install \
-		ARCH="$_carch" \
-		INSTALL_PATH="$pkgdir"/boot \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_MOD_STRIP=1 \
-		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
-	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
-
-	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
-}
-
-sha512sums="
-893bdb7364040b08b74e0775419d0d827f0d2a03d82df359cc8d8d2f1a7d6a7d2c47eb39922c44d5d895857ad4a0b4ac4fdfa32519fc1f2df4c1f880b933f5e9  linux-postmarketos-qcom-msm8960-fdf0eaf11452d72945af31804e2a1048ee1b574c.tar.gz
-27633cf4c3cabaa91b2eea4dc917ab1921308086327a9143c5d61eaa61921fae8b6ca4f662f71ffa2aa5234872cf23f2669eef375719ffb410de906960b49dad  config-postmarketos-qcom-msm8960.armv7
-"