From c805081e64314b6a8b31de7a103bedbf372a083f Mon Sep 17 00:00:00 2001 From: iAboothahir Date: Sun, 23 Mar 2025 18:15:54 +0530 Subject: [PATCH] asus-x00td: move downstream port to unmaintained device-asus-x00td: * Add firmware-qcom-adreno-a530 for adreno fws * Add msm-firmware-loader to load fws from device partitions Signed-off-by: iAboothahir Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6431 --- .../device-asus-x00td-downstream/APKBUILD | 26 +++++++++++ .../device-asus-x00td-downstream/deviceinfo | 32 ++++++++++++++ .../linux-asus-x00td-downstream}/APKBUILD | 9 ++-- .../config-asus-x00td.aarch64 | 0 .../fix-macro-declare_usb_function.patch | 0 device/testing/device-asus-x00td/APKBUILD | 43 +++++++------------ device/testing/device-asus-x00td/deviceinfo | 7 +-- 7 files changed, 82 insertions(+), 35 deletions(-) create mode 100644 device/archived/device-asus-x00td-downstream/APKBUILD create mode 100644 device/archived/device-asus-x00td-downstream/deviceinfo rename device/{testing/linux-asus-x00td => archived/linux-asus-x00td-downstream}/APKBUILD (80%) rename device/{testing/linux-asus-x00td => archived/linux-asus-x00td-downstream}/config-asus-x00td.aarch64 (100%) rename device/{testing/linux-asus-x00td => archived/linux-asus-x00td-downstream}/fix-macro-declare_usb_function.patch (100%) diff --git a/device/archived/device-asus-x00td-downstream/APKBUILD b/device/archived/device-asus-x00td-downstream/APKBUILD new file mode 100644 index 000000000..d9c2dd00f --- /dev/null +++ b/device/archived/device-asus-x00td-downstream/APKBUILD @@ -0,0 +1,26 @@ +# Archived: Downstream port, only for testing. Use mainline port (asus-x00td)! +# This kernel is mostly used for bringing up new features on mainline, thus unmaintained +# Reference: +pkgname=device-asus-x00td-downstream +pkgdesc="Asus Zenfone Max Pro M1 downstream" +pkgver=0.1 +pkgrel=0 +url="postmarketos.org" +arch="aarch64" +license="MIT" +options="!check !archcheck" +depends="linux-asus-x00td-downstream mkbootimg msm-fb-refresher postmarketos-base" +makedepends="devicepkg-dev" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +dee8129a078693d5c5b13da6247615f1b9720d7268e16280ef5d5111b07cd96f534eee91893a20935d182cf6205598d283308f91bc1d7cc7b701907b33090ae8 deviceinfo +" diff --git a/device/archived/device-asus-x00td-downstream/deviceinfo b/device/archived/device-asus-x00td-downstream/deviceinfo new file mode 100644 index 000000000..e535c4ad7 --- /dev/null +++ b/device/archived/device-asus-x00td-downstream/deviceinfo @@ -0,0 +1,32 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Asus ZenFone Max Pro M1" +deviceinfo_manufacturer="Asus" +deviceinfo_codename="asus-x00td-downstream" +deviceinfo_year="2018" +deviceinfo_append_dtb="false" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="2160" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" +deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 buildvariant=userdebug" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_pagesize="4096" +deviceinfo_flash_sparse="true" +deviceinfo_usb_network_function="rndis_bam.rndis" diff --git a/device/testing/linux-asus-x00td/APKBUILD b/device/archived/linux-asus-x00td-downstream/APKBUILD similarity index 80% rename from device/testing/linux-asus-x00td/APKBUILD rename to device/archived/linux-asus-x00td-downstream/APKBUILD index 6db593608..a862a61f8 100644 --- a/device/testing/linux-asus-x00td/APKBUILD +++ b/device/archived/linux-asus-x00td-downstream/APKBUILD @@ -1,7 +1,8 @@ +# Archived: Downstream port, only for testing. Use mainline port (asus-x00td)! # Reference: # Kernel config based on: arch/arm64/configs/X00TD_defconfig -pkgname=linux-asus-x00td +pkgname=linux-asus-x00td-downstream pkgver=4.4.223 pkgrel=0 pkgdesc="Asus ZenFone Max Pro M1 kernel fork" @@ -45,6 +46,8 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" } -sha512sums="84648d1f7e96bf8c14992ce315dc033a9d2f3e46d91ba12e5fdf621ba3fdc58048b9feda9197c2f8f9506a8600fa07484abd4ebcc73d1e98150b65981c4f54cf linux-asus-x00td-ad8e4cb1207f5bb5abbdc0cd51830bd7912d7c2d.tar.gz +sha512sums=" +84648d1f7e96bf8c14992ce315dc033a9d2f3e46d91ba12e5fdf621ba3fdc58048b9feda9197c2f8f9506a8600fa07484abd4ebcc73d1e98150b65981c4f54cf linux-asus-x00td-downstream-ad8e4cb1207f5bb5abbdc0cd51830bd7912d7c2d.tar.gz 67612dd3513592cc8b277476f0cf88af7cdd48cdeec24e9342bbb424bb5ea44bc9a53ea7f5b7d6e3e2f77018aa8b0514004ee28e2dfc1c5326e90ba29f6556e8 config-asus-x00td.aarch64 -8b3934e3c4115e81ac40a3c8022f3134cd89133f7569557ca857b4fd514078c4898b2ba3427986936d029874903711d04d7757d5a87bcb89137073128e51e8f5 fix-macro-declare_usb_function.patch" +8b3934e3c4115e81ac40a3c8022f3134cd89133f7569557ca857b4fd514078c4898b2ba3427986936d029874903711d04d7757d5a87bcb89137073128e51e8f5 fix-macro-declare_usb_function.patch +" diff --git a/device/testing/linux-asus-x00td/config-asus-x00td.aarch64 b/device/archived/linux-asus-x00td-downstream/config-asus-x00td.aarch64 similarity index 100% rename from device/testing/linux-asus-x00td/config-asus-x00td.aarch64 rename to device/archived/linux-asus-x00td-downstream/config-asus-x00td.aarch64 diff --git a/device/testing/linux-asus-x00td/fix-macro-declare_usb_function.patch b/device/archived/linux-asus-x00td-downstream/fix-macro-declare_usb_function.patch similarity index 100% rename from device/testing/linux-asus-x00td/fix-macro-declare_usb_function.patch rename to device/archived/linux-asus-x00td-downstream/fix-macro-declare_usb_function.patch diff --git a/device/testing/device-asus-x00td/APKBUILD b/device/testing/device-asus-x00td/APKBUILD index 544120a17..e00be234f 100644 --- a/device/testing/device-asus-x00td/APKBUILD +++ b/device/testing/device-asus-x00td/APKBUILD @@ -1,20 +1,27 @@ # Reference: pkgname=device-asus-x00td pkgdesc="Asus ZenFone Max Pro M1" -pkgver=4 +pkgver=5 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg" -makedepends="devicepkg-dev" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware +depends=" + firmware-asus-x00td + firmware-qcom-adreno-a530 + linux-postmarketos-qcom-sdm660 + mkbootimg + msm-firmware-loader + postmarketos-base + soc-qcom-sdm660 + soc-qcom-sdm660-rproc +" +makedepends="devicepkg-dev" +source=" + deviceinfo + modules-initfs " -source="deviceinfo modules-initfs" build() { devicepkg_build $startdir $pkgname @@ -24,25 +31,7 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="LineageOS downstream kernel (recommended)" - depends="linux-asus-x00td msm-fb-refresher" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline; for kernel development only (most features aren't working)" - depends="linux-postmarketos-qcom-sdm660 soc-qcom-sdm660 soc-qcom-sdm660-rproc" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Wifi, Bluetooth, GPU, Modem, ADSP, Venus firmware" - depends="firmware-asus-x00td" - mkdir "$subpkgdir" -} - sha512sums=" -57b6b370f79aa393809e491d1245b7212cbf4e8247f94808831afcb886ab5de41a9cd11efc68f8e87b2823d3bc78e188ab37da99067ad0df88a281f03a1a1794 deviceinfo +ce0932ead5ae2bf46d30a9510e6c1f5444e60b4ded252c5058a88efe93b5a10d3cc4cb99d1b2ce813a95b21c55949438d7ecf3f2908f57873e08080738828c4f deviceinfo 57d7031d445f1868c07807d38edcb7c28094c3a67d7d96286aa9e163022f087ef510b44dee33696d85dec0c9becb753996896276abdbdb49ec74483714ddbf55 modules-initfs " diff --git a/device/testing/device-asus-x00td/deviceinfo b/device/testing/device-asus-x00td/deviceinfo index 7c9f78964..9c64f4a7c 100644 --- a/device/testing/device-asus-x00td/deviceinfo +++ b/device/testing/device-asus-x00td/deviceinfo @@ -6,8 +6,8 @@ deviceinfo_name="Asus ZenFone Max Pro M1" deviceinfo_manufacturer="Asus" deviceinfo_codename="asus-x00td" deviceinfo_year="2018" -deviceinfo_dtb_mainline="qcom/sdm636-asus-x00td" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom/sdm636-asus-x00td" +deviceinfo_append_dtb="true" deviceinfo_arch="aarch64" # Device related @@ -21,8 +21,6 @@ deviceinfo_gpu_accelerated="true" # Bootloader related deviceinfo_flash_kernel_on_update="true" deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_downstream="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 buildvariant=userdebug" -deviceinfo_kernel_cmdline_mainline="clk_ignore_unused" deviceinfo_generate_bootimg="true" deviceinfo_generate_extlinux_config="true" deviceinfo_bootimg_qcdt="false" @@ -35,4 +33,3 @@ deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="4096" deviceinfo_flash_sparse="true" deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" -deviceinfo_usb_network_function_downstream="rndis_bam.rndis"