From c45eccd80d134ac0f82d2b23ffe05f0fa79eed10 Mon Sep 17 00:00:00 2001 From: Ultracoolguy Date: Mon, 14 Sep 2020 16:40:48 -0400 Subject: [PATCH] device-motorola-ocean: Modify for mainline support (MR 1558) device-motorola-ocean: Add support for both downstream and mainline kernel device-motorola-ocean: Update dependency for downstream kernel The dependency mentioned is wcnss-wlan. Apply 1 suggestion(s) to 1 file(s) --- device/testing/device-motorola-ocean/APKBUILD | 23 ++++++++++++------- .../testing/device-motorola-ocean/deviceinfo | 6 ++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/device/testing/device-motorola-ocean/APKBUILD b/device/testing/device-motorola-ocean/APKBUILD index 03f31e48d..13d0351a6 100644 --- a/device/testing/device-motorola-ocean/APKBUILD +++ b/device/testing/device-motorola-ocean/APKBUILD @@ -8,15 +8,10 @@ url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -# Without msm-fb-refresher the display works as long as you execute -# cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode -# as root (at least on weston). With it installed, it makes the screen too dim -# to be usable. Which is why it shouldn't be added until the issue gets fixed -# somehow. -depends="postmarketos-base linux-motorola-ocean mkbootimg mesa-dri-gallium" +depends="postmarketos-base mkbootimg mesa-dri-gallium" makedepends="devicepkg-dev" source="deviceinfo" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" +subpackages="$pkgname-kernel-downstream:kernel_downstream $pkgname-kernel-mainline:kernel_mainline $pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -26,10 +21,22 @@ package() { devicepkg_package $startdir $pkgname } +kernel_downstream() { + pkgdesc="Wifi, USB, partially screen, and other miscellanious stuff works. (See device table for details)" + depends="linux-motorola-ocean wcnss-wlan" + devicepkg_subpackage_kernel $startdir $pkgname $subpkgname +} + +kernel_mainline() { + pkgdesc="It's currently WIP. Most features don't work." + depends="linux-postmarketos-qcom-msm8953" + devicepkg_subpackage_kernel $startdir $pkgname $subpkgname +} + nonfree_firmware() { pkgdesc="Wifi and video firmware" depends="firmware-motorola-ocean" mkdir "$subpkgdir" } -sha512sums="fbeb62e9fff42feb6e1ec926ca584f630968b5a7aefa1f637c80b089dcd9897e55b7f6e73d5c75767493ef373e2253e7506a0a55417f5bfc67de4ddc66fcb966 deviceinfo" +sha512sums="c056fa543261d20f4582d1e7c25a23982157fc54c95fb714bd75e69db0d747779ae218b57a9a71cd92c4708645f024f891ba715cc494dc080d28199ac63065db deviceinfo" diff --git a/device/testing/device-motorola-ocean/deviceinfo b/device/testing/device-motorola-ocean/deviceinfo index 3b50850e9..03dabe924 100644 --- a/device/testing/device-motorola-ocean/deviceinfo +++ b/device/testing/device-motorola-ocean/deviceinfo @@ -7,6 +7,9 @@ deviceinfo_manufacturer="Motorola" deviceinfo_codename="motorola-ocean" deviceinfo_year="2019" deviceinfo_arch="aarch64" +deviceinfo_dtb_mainline="qcom/sdm632-motorola-ocean" +deviceinfo_append_dtb_mainline="true" +deviceinfo_modules_initfs_mainline="msm panel-mipi-dsi-generic" # Device related deviceinfo_chassis="handset" @@ -17,7 +20,8 @@ deviceinfo_screen_height="1520" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_hs,0x78af000 firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7 printk.devkmsg=on androidboot.hab.csv=12 androidboot.hab.product=ocean androidboot.hab.cid=21 buildvariant=user veritykeyid=id:b640f6ee9102b88daa3450b13ef25fc9eb143d63" +deviceinfo_kernel_cmdline_downstream="console=ttyMSM0,115200 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_hs,0x78af000 firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7 printk.devkmsg=on androidboot.hab.csv=12 androidboot.hab.product=ocean androidboot.hab.cid=21 buildvariant=user veritykeyid=id:b640f6ee9102b88daa3450b13ef25fc9eb143d63" +deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false"