xiaomi-daisy: Change kernel to msm8953-mainline and add gpu firmware to initramfs (MR 2225)

device/testing/device-xiaomi-daisy/30-gpu-firmware.files

@@ -0,0 +1,6 @@
+/lib/firmware/postmarketos/a506_zap.b00
+/lib/firmware/postmarketos/a506_zap.b01
+/lib/firmware/postmarketos/a506_zap.b02
+/lib/firmware/postmarketos/a506_zap.mdt
+/lib/firmware/postmarketos/a530_pfp.fw
+/lib/firmware/postmarketos/a530_pm4.fw

device/testing/device-xiaomi-daisy/APKBUILD

@@ -3,18 +3,19 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=0.1
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-xiaomi-daisy mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-postmarketos-qcom-msm8953 mkbootimg mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
 	fb.modes
 	pointercal
+	30-gpu-firmware.files
 	"
 
 build() {
@@ -23,8 +24,9 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm0755 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
-	install -Dm0755 "$srcdir"/pointercal "$pkgdir"/etc/pointercal
+	install -Dm0644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
+	install -Dm0644 "$srcdir"/pointercal "$pkgdir"/etc/pointercal
+	install -Dm0644 "$srcdir"/30-gpu-firmware.files "$pkgdir"/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files
 }
 
 nonfree_firmware() {
@@ -33,6 +35,9 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="ad71d15408a4d852c7202d12819708193b3ef5de2aef5d60c542631194b3207a9acb017fd91954b0c245a3c4ff95fbb3835ffef493877fc00fb6c54944c601f9  deviceinfo
+sha512sums="
+749e63b2d2c2586b77062aeef24dd080e0f405dff5c2380a1bd293a3839f68d0e40dc61c9d4c0bf47025dcacbd16076108d69b997851e2a6d40f7b3e473f7447  deviceinfo
 9b888f3a4ef3ed3c0b2e9c6a6e8a6c686909c530c3d95be797b47b4eb9deb55d64190b7a3736e44139630bfff5e295625a855052923369fdd37889060a3220ca  fb.modes
-4fa63c184f00033fbae2e4b140c9655061b3b662e337f7bdf5f8e26f7b57d6c66ad01fc93da05ce7d330f0f05bb0d36cc9b356ebfc7eb4200be4d4cc03afc975  pointercal"
+4fa63c184f00033fbae2e4b140c9655061b3b662e337f7bdf5f8e26f7b57d6c66ad01fc93da05ce7d330f0f05bb0d36cc9b356ebfc7eb4200be4d4cc03afc975  pointercal
+302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
+"

device/testing/device-xiaomi-daisy/deviceinfo

@@ -6,9 +6,11 @@ deviceinfo_name="Xiaomi Mi A2 Lite"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-daisy"
 deviceinfo_year="2018"
-deviceinfo_dtb=""
+deviceinfo_dtb="qcom/sdm625-xiaomi-daisy"
+deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"
+deviceinfo_mesa_driver="msm"
 
 # Device related
 deviceinfo_chassis="handset"
@@ -16,14 +18,13 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2280"
-deviceinfo_dev_touchscreen="/dev/input/event1"
 deviceinfo_dev_touchscreen_calibration="/etc/pointercal"
 deviceinfo_swap_size_recommended="1024"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78af000 androidboot.usbconfigfs=false loop.max_part=7 buildvariant=user veritykeyid=id:5560e7863b4d8118c2f1b065595cf93bb2447992"
 deviceinfo_generate_bootimg="true"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"