From b581147c0b93a257ccb04da893e5293e80f2c0b8 Mon Sep 17 00:00:00 2001 From: Sireesh Kodali Date: Fri, 13 Nov 2020 18:02:45 +0530 Subject: [PATCH] motorola-potter: switch to linux-postmarketos-qcom-msm8953 (MR 1796) * add optional nonfree-firmware dependency * drop downstream kernel [ci:skip-build]: already built successfully in CI --- .../testing/device-motorola-potter/APKBUILD | 22 ++++++++++++++----- .../testing/device-motorola-potter/deviceinfo | 10 ++++----- .../device-motorola-potter/initfs-hook.sh | 5 ----- 3 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 device/testing/device-motorola-potter/initfs-hook.sh diff --git a/device/testing/device-motorola-potter/APKBUILD b/device/testing/device-motorola-potter/APKBUILD index 5af4e8dbf..94fba4659 100644 --- a/device/testing/device-motorola-potter/APKBUILD +++ b/device/testing/device-motorola-potter/APKBUILD @@ -1,15 +1,20 @@ +# Maintainer: Sireesh Kodali # Reference: pkgname=device-motorola-potter pkgdesc="Motorola Moto G5 Plus" -pkgver=0.1 -pkgrel=11 +pkgver=0.2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base linux-motorola-potter mkbootimg mesa-dri-swrast msm-fb-refresher" +depends="postmarketos-base linux-postmarketos-qcom-msm8953 mkbootimg mesa-dri-gallium" makedepends="devicepkg-dev" -source="deviceinfo initfs-hook.sh" +source="deviceinfo" + +subpackages=" + $pkgname-nonfree-firmware:nonfree_firmware +" build() { devicepkg_build $startdir $pkgname @@ -19,5 +24,10 @@ package() { devicepkg_package $startdir $pkgname } -sha512sums="45e755703484875df218ff61aa93081edc33675d4a332acc09656c04f2b0e2b9f7ab4b603cc858061fe75d93f11a4dc00e9b0a25a781a5d1b6a0327261f308fc deviceinfo -720c52a43302001ba69d69207cc3a21714e20178c1fe93350390ab3da51e12ba0b676c9dba8edeae8551a9f06c2801f44da6d40ad007498a9e4eaca23fb6dee6 initfs-hook.sh" +nonfree_firmware() { + pkgdesc="GPU/Wi-Fi/Bluetooth/Audio/Video/Modem firmware" + depends="firmware-motorola-potter" + mkdir "$subpkgdir" +} + +sha512sums="7834ed8225bba951afbc60347676217ed081b6f393c3915ab46a37f3b5a4dadc226dbfa01b21e4a320a274d655c569974b1baf194c1ee6a4218a1fc3e19b91cc deviceinfo" diff --git a/device/testing/device-motorola-potter/deviceinfo b/device/testing/device-motorola-potter/deviceinfo index 166e1d07e..f6b5e7301 100644 --- a/device/testing/device-motorola-potter/deviceinfo +++ b/device/testing/device-motorola-potter/deviceinfo @@ -6,7 +6,8 @@ deviceinfo_name="Motorola Moto G5 Plus" deviceinfo_manufacturer="Motorola" deviceinfo_codename="motorola-potter" deviceinfo_year="2017" -deviceinfo_dtb="" +deviceinfo_dtb="qcom/sdm625-motorola-potter" +deviceinfo_append_dtb="true" deviceinfo_modules_initfs="" deviceinfo_arch="aarch64" @@ -16,17 +17,16 @@ deviceinfo_keyboard="false" deviceinfo_external_storage="true" deviceinfo_screen_width="1080" deviceinfo_screen_height="1920" -deviceinfo_dev_touchscreen="/dev/input/event2" +deviceinfo_getty="ttyMSM0;115200" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=30 msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 vmalloc=350M androidboot.selinux=permissive buildvariant=eng" +deviceinfo_kernel_cmdline="" deviceinfo_generate_bootimg="true" -deviceinfo_bootimg_qcdt="true" deviceinfo_flash_offset_base="0x80000000" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x01000000" deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="2048" - +deviceinfo_flash_sparse="true" diff --git a/device/testing/device-motorola-potter/initfs-hook.sh b/device/testing/device-motorola-potter/initfs-hook.sh deleted file mode 100644 index 31ec09604..000000000 --- a/device/testing/device-motorola-potter/initfs-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# make touchscreen work - -echo 1 > /sys/devices/soc/78b7000.i2c/i2c-3/3-0020/drv_irq