From 117ffa602f7b8e25f491a50fff2b0c765917af71 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Fri, 21 Jun 2024 20:12:31 +0200 Subject: [PATCH] xiaomi-tulip: use soc-qcom-sdm660 and general enhancements (MR 5265) --- device/testing/device-xiaomi-tulip/APKBUILD | 46 ++++-------- device/testing/device-xiaomi-tulip/deviceinfo | 17 +++-- .../device-xiaomi-tulip/modules-initfs | 3 +- .../30-gpu-firmware.files | 12 ++- device/testing/firmware-xiaomi-tulip/APKBUILD | 37 +++------ .../firmware-xiaomi-tulip/firmware.files | 75 ------------------- 6 files changed, 43 insertions(+), 147 deletions(-) delete mode 100644 device/testing/firmware-xiaomi-tulip/firmware.files diff --git a/device/testing/device-xiaomi-tulip/APKBUILD b/device/testing/device-xiaomi-tulip/APKBUILD index 6c111be7b..48155d982 100644 --- a/device/testing/device-xiaomi-tulip/APKBUILD +++ b/device/testing/device-xiaomi-tulip/APKBUILD @@ -1,24 +1,28 @@ -# Maintainer: m0rf30 # Reference: +# Maintainer: m0rf30 pkgname=device-xiaomi-tulip pkgdesc="Xiaomi Redmi Note 6 Pro" -pkgver=1 -pkgrel=4 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg" -makedepends="devicepkg-dev" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-kernel-mainline:kernel_mainline - $pkgname-modem +depends=" + firmware-xiaomi-tulip + 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 - " +" build() { devicepkg_build $startdir $pkgname @@ -28,25 +32,7 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="Wi-Fi, ADSP Firmware" - depends="firmware-xiaomi-tulip" - mkdir "$subpkgdir" -} - -kernel_mainline() { - pkgdesc="Close to mainline; for kernel development only (most features aren't working)" - depends="linux-postmarketos-qcom-sdm660" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -modem() { - depends="rmtfs rmtfs-openrc msm-modem-uim-selection" - install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware" - mkdir "$subpkgdir" -} - sha512sums=" -6788f1aa1740359f8f171f916ce92c521ed984bb444f0405bdec2c57c0c55e629540f050c5bff80945147989ca440807dd8b173d2c57e4ab86308097347aae61 deviceinfo -966bea41747858689abad7585985d8fbbee93a91ccf479adbde4ecc2c86b17c1895ccd0a845ec238e63bca66b73ce12c6fada48dd23dbd0e6b5eaa38bea2a3bd modules-initfs +241f8107b4c45402fb945007e3811d751c9dffdac0a91281a96b2f5ce80f66e7d477ad0319dcefe470d60a2202ad70cf3b6a8685e4222a057d3f3f5a440d9618 deviceinfo +2985ce67fe3a5cd4cd03c9c5e7af072174775a97b4d26c40b025a82b33fead69f7cb4ac185db1b7b97d61b02ebdf56c88f77f55d2dd352ac2d7e47394563dbe2 modules-initfs " diff --git a/device/testing/device-xiaomi-tulip/deviceinfo b/device/testing/device-xiaomi-tulip/deviceinfo index 9e093fa90..ee62d36c6 100644 --- a/device/testing/device-xiaomi-tulip/deviceinfo +++ b/device/testing/device-xiaomi-tulip/deviceinfo @@ -7,29 +7,30 @@ deviceinfo_name="Xiaomi Redmi Note 6 Pro" deviceinfo_manufacturer="Xiaomi" deviceinfo_codename="xiaomi-tulip" deviceinfo_year="2018" -deviceinfo_dtb_mainline="qcom/sdm636-xiaomi-tulip" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom/sdm636-xiaomi-tulip" +deviceinfo_append_dtb="true" deviceinfo_arch="aarch64" +deviceinfo_flash_kernel_on_update="true" # Device related +deviceinfo_gpu_accelerated="true" deviceinfo_chassis="handset" deviceinfo_keyboard="false" deviceinfo_external_storage="true" deviceinfo_screen_width="1080" deviceinfo_screen_height="2280" +deviceinfo_swap_size_recommended="1024" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200" +deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" +deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" -deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_sparse="true" deviceinfo_flash_offset_base="0x00000000" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x01000000" -deviceinfo_flash_offset_second="0x00000000" +deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="4096" -deviceinfo_header_version="0" -deviceinfo_flash_sparse="true" - diff --git a/device/testing/device-xiaomi-tulip/modules-initfs b/device/testing/device-xiaomi-tulip/modules-initfs index 6f8091bd4..b804ddd7c 100644 --- a/device/testing/device-xiaomi-tulip/modules-initfs +++ b/device/testing/device-xiaomi-tulip/modules-initfs @@ -1,3 +1,2 @@ msm -qcom_fg -qcom_pmi8998_charger +nt36xxx diff --git a/device/testing/firmware-xiaomi-tulip/30-gpu-firmware.files b/device/testing/firmware-xiaomi-tulip/30-gpu-firmware.files index 1e0f8e648..7a0aba5fe 100644 --- a/device/testing/firmware-xiaomi-tulip/30-gpu-firmware.files +++ b/device/testing/firmware-xiaomi-tulip/30-gpu-firmware.files @@ -1,7 +1,5 @@ -/lib/firmware/qcom/a530_pfp.fw -/lib/firmware/qcom/a530_pm4.fw -/lib/firmware/qcom/a512_zap.b00 -/lib/firmware/qcom/a512_zap.b01 -/lib/firmware/qcom/a512_zap.b02 -/lib/firmware/qcom/a512_zap.elf -/lib/firmware/qcom/a512_zap.mdt +qcom/a512_zap.b00 +qcom/a512_zap.b01 +qcom/a512_zap.b02 +qcom/a512_zap.elf +qcom/a512_zap.mdt diff --git a/device/testing/firmware-xiaomi-tulip/APKBUILD b/device/testing/firmware-xiaomi-tulip/APKBUILD index e71081e7a..6fb02fb69 100644 --- a/device/testing/firmware-xiaomi-tulip/APKBUILD +++ b/device/testing/firmware-xiaomi-tulip/APKBUILD @@ -1,42 +1,29 @@ # Maintainer: m0rf30 pkgname=firmware-xiaomi-tulip -pkgver=1 -pkgrel=1 - +pkgver=2 +pkgrel=0 +_commit="c8f750d4cdd8c5353c4aaa423f81774c63f87d27" pkgdesc="Firmware files for Xiaomi Redmi Note 6 Pro" -url="https://github.com/M0Rf30/postmarketos-vendor-xiaomi-tulip" +url="https://postmarketos.org" arch="aarch64" license="proprietary" -options="!strip !check !archcheck !tracedeps pmb:cross-native" - -_commit="c8f750d4cdd8c5353c4aaa423f81774c63f87d27" - -source=" - $pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz +options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native" +source="$pkgname-$_commit.tar.gz::https://github.com/M0Rf30/postmarketos-vendor-xiaomi-tulip/archive/$_commit.tar.gz 30-gpu-firmware.files - firmware.files" +" -subpackages="$pkgname-initramfs:firmware_initramfs" builddir="$srcdir/postmarketos-vendor-xiaomi-tulip-$_commit" - +_fwdir="/lib/firmware/qcom" package() { while IFS="" read -r fw; do - install -Dm644 "$fw" "$pkgdir/lib/firmware/$fw" - done < "$srcdir"/firmware.files -} + install -Dm644 "$fw" -t "$pkgdir/$_fwdir" + done < "$srcdir"/30-gpu-firmware.files -firmware_initramfs() { - pkgdesc="Files to be included in the initramfs to support osk-sdl" - depends="$pkgname mesa-egl mesa-gbm" - install_if="$pkgname" - - install -Dm644 "$srcdir"/30-gpu-firmware.files \ - "$subpkgdir"/usr/share/mkinitfs/files/30-gpu-firmware.files + install -Dm644 qcom/a512_zap.elf "$pkgdir/$_fwdir/a512_zap.mbn" } sha512sums=" fd36819cabb028973015587e4193642e7c36b2321181a1c3dc7631fcfe51e7e736f4679665d4e4ad2eef8ddd4fe541a8a15e93189822702e23463a43023fe549 firmware-xiaomi-tulip-c8f750d4cdd8c5353c4aaa423f81774c63f87d27.tar.gz -f4a81bc3b5fbcac001c6583f78a26b0e11787c3e2d423a72b6db1fbfab69a37f095ed303dfbcf0d6050864dbec9fcd977b9c827e4ba79e86c45491d238ea6c36 30-gpu-firmware.files -4197803672f89fb8d8a6e87ed348544dd645025fc8bbc998296e9a214fb5095edc9e1c5c5a843b06855ccec40f4ea56526c3e08a79f9220776de34593d4b12a1 firmware.files +4ec4f0da2d0d0aab4db5b212cdfffebc8dfa50bfc9863145a500a244fce50ab2eabbc0c24b9ab6ad6a5bdaeffeb9f61923b7967450778c3d3475a4a7ad69efe7 30-gpu-firmware.files " diff --git a/device/testing/firmware-xiaomi-tulip/firmware.files b/device/testing/firmware-xiaomi-tulip/firmware.files deleted file mode 100644 index 90b1a508f..000000000 --- a/device/testing/firmware-xiaomi-tulip/firmware.files +++ /dev/null @@ -1,75 +0,0 @@ -ath10k/WCN3990/hw1.0/board-2.bin -ath10k/WCN3990/hw1.0/firmware-5.bin -qca/crbtfw21.tlv -qca/crnv21.bin -qcom/a512_zap.b00 -qcom/a512_zap.b01 -qcom/a512_zap.b02 -qcom/a512_zap.elf -qcom/a512_zap.mdt -qcom/a530_pfp.fw -qcom/a530_pm4.fw -qcom/a540_gpmu.fw2 -qcom/venus-4.4/venus.b00 -qcom/venus-4.4/venus.b01 -qcom/venus-4.4/venus.b02 -qcom/venus-4.4/venus.b03 -qcom/venus-4.4/venus.b04 -qcom/venus-4.4/venus.mdt -adsp.b00 -adsp.b01 -adsp.b02 -adsp.b03 -adsp.b04 -adsp.b05 -adsp.b06 -adsp.b07 -adsp.b08 -adsp.b09 -adsp.b10 -adsp.b11 -adsp.b12 -adsp.b13 -adsp.b14 -adsp.b15 -adsp.b16 -adsp.b17 -adsp.b18 -adsp.b19 -adsp.b20 -adsp.b21 -adsp.b22 -adsp.b23 -adsp.mdt -mba.mbn -modem.b00 -modem.b01 -modem.b02 -modem.b03 -modem.b04 -modem.b05 -modem.b06 -modem.b07 -modem.b08 -modem.b09 -modem.b10 -modem.b11 -modem.b12 -modem.b13 -modem.b14 -modem.b16 -modem.b17 -modem.b18 -modem.b20 -modem.b21 -modem.b22 -modem.b23 -modem.b24 -modem.b25 -modem.b26 -modem.b27 -modem.b28 -modem.mdt -modemr.jsn -modemuw.jsn -wlanmdsp.mbn