From eec966d19f105dbe4537ad74a3ed8cd817273fb4 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 15 Jan 2020 21:20:16 +0100 Subject: [PATCH] wileyfox-crackling: use appended DTB instead of QCDT (!907) The Wileyfox Swift is the only mainline MSM8916 device using QCDT at the moment. The other devices do not have unique qcom,board-ids that could be used within QCDT. So far this has worked fine for the Wileyfox Swift. However, in preparation to *optionally* load the modem we now need two separate pairs of DTBs (one with modem and one without modem). This is simple to implement using appended DTBs, but not possible with QCDT. So let's stop using QCDT entirely for mainline, and use appended DTBs for wileyfox-crackling. --- device/device-wileyfox-crackling/APKBUILD | 2 +- device/device-wileyfox-crackling/deviceinfo | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/device/device-wileyfox-crackling/APKBUILD b/device/device-wileyfox-crackling/APKBUILD index bbc32326b..3c0329177 100644 --- a/device/device-wileyfox-crackling/APKBUILD +++ b/device/device-wileyfox-crackling/APKBUILD @@ -48,5 +48,5 @@ nonfree_firmware() { mkdir "$subpkgdir" } -sha512sums="8f5d7e2e07ae4f0f2165d00d095c83381c28e209054d51a449f4f2e2337679a13e7b3769df3c7b4b893831d1ad50f3c65c10339b55215ed9409ede1482cc3791 deviceinfo +sha512sums="904e1080dc42bbf438b13d4cec7871425ec39c9f33700276849f43c0f4504902c4873f31be0cb027407062689ba85a1b03136d9d73b44ae392d0474378418598 deviceinfo 587be41a15f5738c6f55c52f760e08810185a00af886e84864f77ce38675bdf65893779a4ea88c9811023746895818ce5829a1b060e158f2cdae87d13e13f07d fb.modes" diff --git a/device/device-wileyfox-crackling/deviceinfo b/device/device-wileyfox-crackling/deviceinfo index 51a2148dd..def68e4fa 100644 --- a/device/device-wileyfox-crackling/deviceinfo +++ b/device/device-wileyfox-crackling/deviceinfo @@ -6,7 +6,8 @@ deviceinfo_name="Wileyfox Swift" deviceinfo_manufacturer="Wileyfox" deviceinfo_codename="wileyfox-crackling" deviceinfo_date="" -deviceinfo_dtb="" +deviceinfo_dtb_mainline="qcom/msm8916-longcheer-l8150" +deviceinfo_append_dtb_mainline="true" deviceinfo_modules_initfs_downstream="" deviceinfo_modules_initfs_mainline="panel-booyi-otm1287 msm rmi_i2c qcom-spmi-vadc dumb-adc-battery" deviceinfo_arch="aarch64" @@ -25,7 +26,7 @@ deviceinfo_flash_method="fastboot" deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0x78b0000 console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT" deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 loop.max_part=7 buildvariant=userdebug" deviceinfo_generate_bootimg="true" -deviceinfo_bootimg_qcdt="true" +deviceinfo_bootimg_qcdt_downstream="true" deviceinfo_flash_offset_base="0x80000000" deviceinfo_flash_offset_kernel="0x00080000" deviceinfo_flash_offset_ramdisk="0x02000000"