device-oneplus-fajita: fix osk-sdl (MR 2206)

Add the missing depends to add the GPU firmware to the initramfs
so that osk-sdl works properly, as well as the haptics driver.

Also make all logs go to UART, this will clean up the splash screen and
let developers with UART access debug the boot process.

[ci:skip-build] This MR was already built on CI
This commit is contained in:
Caleb Connolly 2021-05-30 20:32:11 +01:00 committed by Alexey Minnekhanov
parent 8fe6b73d06
commit be94e89c02
No known key found for this signature in database
GPG key ID: EBF5ECFFFEE34DED
2 changed files with 10 additions and 8 deletions

View file

@ -3,13 +3,13 @@
pkgname=device-oneplus-fajita
pkgdesc="OnePlus 6T"
pkgver=1
pkgver=2
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="postmarketos-base mkbootimg linux-postmarketos-qcom-sdm845 soc-qcom-sdm845"
depends="postmarketos-base mkbootimg linux-postmarketos-qcom-sdm845 soc-qcom-sdm845 soc-qcom-sdm845-ucm"
makedepends="devicepkg-dev"
source="deviceinfo rootston.ini"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
@ -23,8 +23,8 @@ package() {
}
nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware"
depends="firmware-oneplus-sdm845"
pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
mkdir "$subpkgdir"
}
@ -34,5 +34,7 @@ phosh() {
"$subpkgdir"/etc/phosh/rootston.ini
}
sha512sums="034def213ac5720be477251f9ba1ece31b733716f8372cdb58e36d405f0a4d651abb5943fd9d5fb55c20c8dcaac4398372ddace863a4cae589bb62e3599af453 deviceinfo
035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9 rootston.ini"
sha512sums="
9b4cdfa1f9a07461b761dc2e655136b68616675b4f8401d2626697b69f3f3a0315cc727848854070bf24ccbd3e98983ea4577e53a39ea3b7130b7263932c5e24 deviceinfo
035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9 rootston.ini
"

View file

@ -17,7 +17,7 @@ deviceinfo_screen_height="2340"
# Bootloader related
deviceinfo_flash_method="fastboot"
deviceinfo_kernel_cmdline="quiet"
deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200"
deviceinfo_generate_bootimg="true"
deviceinfo_bootimg_qcdt="false"
deviceinfo_bootimg_dtb_second="false"
@ -37,5 +37,5 @@ deviceinfo_append_dtb="true"
deviceinfo_rootfs_image_sector_size="4096"
# osk-sdl
deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg"
deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg pmi8998_haptics"
deviceinfo_mesa_driver="msm"