diff --git a/device/archived/device-oneplus-instantnoodlep-downstream/APKBUILD b/device/archived/device-oneplus-instantnoodlep-downstream/APKBUILD new file mode 100644 index 000000000..21e0c413a --- /dev/null +++ b/device/archived/device-oneplus-instantnoodlep-downstream/APKBUILD @@ -0,0 +1,32 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +pkgname=device-oneplus-instantnoodlep-downstream +pkgdesc="OnePlus 8 Pro (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends=" + linux-oneplus-instantnoodlep-downstream + mkbootimg + postmarketos-base +" +makedepends=" + devicepkg-dev + dtc +" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +4aa34ba965860b3106316fd33bf1dac5df5fa5252bba37f02b550163af1157252cd3071f7e8f4352ddb32fc65198e707c992d5f025b7ddc8b11f29755c6b7e11 deviceinfo +" diff --git a/device/archived/device-oneplus-instantnoodlep-downstream/deviceinfo b/device/archived/device-oneplus-instantnoodlep-downstream/deviceinfo new file mode 100644 index 000000000..34b92b24c --- /dev/null +++ b/device/archived/device-oneplus-instantnoodlep-downstream/deviceinfo @@ -0,0 +1,38 @@ +# Reference: +# Please use double quotes only. You can source this file in shell +# scripts. + +deviceinfo_format_version="0" +deviceinfo_name="OnePlus 8 Pro" +deviceinfo_manufacturer="OnePlus" +deviceinfo_codename="oneplus-instantnoodlep-downstream" +deviceinfo_year="2020" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="false" +deviceinfo_screen_width="1440" +deviceinfo_screen_height="3168" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="androidboot.console=ttyMSM0 androidboot.hardware=qcom androidboot.memcg=1 androidboot.usbcontroller=a600000.dwc3 cgroup.memory=nokmem,nosocket loop.max_part=7 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x237 reboot=panic_warm service_locator.enable=1 swiotlb=2048 buildvariant=userdebug printk.devkmsg=on" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_pagesize="4096" +deviceinfo_header_version="0" +deviceinfo_append_dtb="false" +deviceinfo_flash_offset_dtb="0x01f00000" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00000000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_fastboot_partition_rootfs="super" +deviceinfo_flash_fastboot_partition_dtbo="dtbo" +deviceinfo_super_partitions="/dev/sda14 /dev/sda14" +deviceinfo_rootfs_image_sector_size="4096" +deviceinfo_flash_sparse="true" diff --git a/device/testing/linux-oneplus-instantnoodlep/0001-comment-out-mgeneral-regs-only-flag.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0001-comment-out-mgeneral-regs-only-flag.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0001-comment-out-mgeneral-regs-only-flag.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0001-comment-out-mgeneral-regs-only-flag.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/0002-remove-inline-from-fn-usb-driver.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0002-remove-inline-from-fn-usb-driver.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0002-remove-inline-from-fn-usb-driver.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0002-remove-inline-from-fn-usb-driver.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/0003-remove-inline-techpack-dispay-driver.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0003-remove-inline-techpack-dispay-driver.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0003-remove-inline-techpack-dispay-driver.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0003-remove-inline-techpack-dispay-driver.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/0004-fix-enum-with-attempted-integer-subclass-syntax-issue.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0004-fix-enum-with-attempted-integer-subclass-syntax-issue.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0004-fix-enum-with-attempted-integer-subclass-syntax-issue.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0004-fix-enum-with-attempted-integer-subclass-syntax-issue.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/0005-remove-inline-usb-driver-ax_get_stats.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0005-remove-inline-usb-driver-ax_get_stats.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0005-remove-inline-usb-driver-ax_get_stats.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0005-remove-inline-usb-driver-ax_get_stats.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/0006-remove-inline-driver-lowmem_dbg.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0006-remove-inline-driver-lowmem_dbg.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0006-remove-inline-driver-lowmem_dbg.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0006-remove-inline-driver-lowmem_dbg.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/0007-fix-variably-sized-array-initialization.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/0007-fix-variably-sized-array-initialization.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/0007-fix-variably-sized-array-initialization.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/0007-fix-variably-sized-array-initialization.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/APKBUILD b/device/archived/linux-oneplus-instantnoodlep-downstream/APKBUILD similarity index 94% rename from device/testing/linux-oneplus-instantnoodlep/APKBUILD rename to device/archived/linux-oneplus-instantnoodlep-downstream/APKBUILD index 50c7a26f0..51a5254d1 100644 --- a/device/testing/linux-oneplus-instantnoodlep/APKBUILD +++ b/device/archived/linux-oneplus-instantnoodlep-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: arch/arm64/configs/vendor/kona_defconfig -pkgname=linux-oneplus-instantnoodlep +pkgname=linux-oneplus-instantnoodlep-downstream pkgver=4.19.272 -pkgrel=1 +pkgrel=0 pkgdesc="OnePlus 8 Pro kernel fork" arch="aarch64" _carch="arm64" @@ -71,7 +72,7 @@ package() { } sha512sums=" -8b291904ba7ea00fe32da7803415fa2e889cd2d964b454fb457923c2c462ab4ee02a843e6286f2a69f8530b4d09965ad21683b771c180124605bc7d15cfa07fb linux-oneplus-instantnoodlep-28048669da64fdc5c7d9b1697531ed25d62ea9aa.tar.gz +8b291904ba7ea00fe32da7803415fa2e889cd2d964b454fb457923c2c462ab4ee02a843e6286f2a69f8530b4d09965ad21683b771c180124605bc7d15cfa07fb linux-oneplus-instantnoodlep-downstream-28048669da64fdc5c7d9b1697531ed25d62ea9aa.tar.gz 8f8e2c0e34229bc0958b711c6a6509e6ff1f3535146954ea927f023ce707d56cc548424732dd458556dd2851a7add584f78ccf67a9cefaf7d690f693f7639a1e config-oneplus-instantnoodlep.aarch64 bbd3790b58b1f0c28bac25cd50533fa9bb60d5727480ee3ff0063fbcc83c1b188d820cd7de736ca6bb67821b76071f54c46e5e5292a79e744af122bdc1a17ac0 0001-comment-out-mgeneral-regs-only-flag.patch 37ff67b6aadcc8cf432c1e41d5ea9cecd882986df274a02ad7978401d86ef821809d6cb195881192626e5545e6b0668cb475ebe9cb42e583452e424854ddec78 0002-remove-inline-from-fn-usb-driver.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/Suppress-error-about-static-buffer-overflow.patch b/device/archived/linux-oneplus-instantnoodlep-downstream/Suppress-error-about-static-buffer-overflow.patch similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/Suppress-error-about-static-buffer-overflow.patch rename to device/archived/linux-oneplus-instantnoodlep-downstream/Suppress-error-about-static-buffer-overflow.patch diff --git a/device/testing/linux-oneplus-instantnoodlep/config-oneplus-instantnoodlep.aarch64 b/device/archived/linux-oneplus-instantnoodlep-downstream/config-oneplus-instantnoodlep.aarch64 similarity index 100% rename from device/testing/linux-oneplus-instantnoodlep/config-oneplus-instantnoodlep.aarch64 rename to device/archived/linux-oneplus-instantnoodlep-downstream/config-oneplus-instantnoodlep.aarch64 diff --git a/device/testing/device-oneplus-instantnoodlep/APKBUILD b/device/testing/device-oneplus-instantnoodlep/APKBUILD index fa60ecfe0..2224fd06e 100644 --- a/device/testing/device-oneplus-instantnoodlep/APKBUILD +++ b/device/testing/device-oneplus-instantnoodlep/APKBUILD @@ -1,13 +1,15 @@ # Reference: pkgname=device-oneplus-instantnoodlep pkgdesc="OnePlus 8 Pro" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-oneplus-instantnoodlep + linux-postmarketos-qcom-sm8250 mkbootimg postmarketos-base " @@ -15,11 +17,6 @@ makedepends=" devicepkg-dev dtc " -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware -" source=" deviceinfo sm8250-oneplus-instantnoodlep-empty.dts @@ -27,34 +24,17 @@ source=" build() { devicepkg_build $startdir $pkgname + + dtc -O dtb -o "$srcdir/dtbo.img" -I dts "$srcdir/sm8250-oneplus-instantnoodlep-empty.dts" } package() { devicepkg_package $startdir $pkgname -} -kernel_downstream() { - pkgdesc="Downstream kernel (not recommended, for debugging purposes)" - depends="linux-oneplus-instantnoodlep" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Mainline kernel (recommended)" - depends="linux-postmarketos-qcom-sm8250" - - dtc -O dtb -o "$srcdir/dtbo.img" -I dts "$srcdir/sm8250-oneplus-instantnoodlep-empty.dts" - install -Dm644 "$srcdir/dtbo.img" "$subpkgdir/boot/dtbo.img" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Firmware for OnePlus 8 Pro" - depends="firmware-oneplus-instantnoodlep" - mkdir "$subpkgdir" + install -Dm644 "$srcdir/dtbo.img" "$pkgdir/boot/dtbo.img" } sha512sums=" -7b09d85fb3eeda9700994db0038cc5ff4986a46b1d3cce9cdc639c765d9dfdeb4ff06c0c5aefb6e9bda2bfc699de43e3cc312733e1ea8b8c9291ce35caa56126 deviceinfo +68c3a267cc4ab63d86292bf5e8caebcb0be147c42dd0c3cde639347220d39d580b5bc0d59b81eb4c49f132dfe5c03caed1307507d32b6da386e59336c7f804ce deviceinfo 06269dcbd405a18576a476bb976d39bcf91e8c7885a87716f510d66abc2ffe3bfabe56c286ad6fc88878de07427e58965ac833ac0e8cfa7ad393c2fa3b535c88 sm8250-oneplus-instantnoodlep-empty.dts " diff --git a/device/testing/device-oneplus-instantnoodlep/deviceinfo b/device/testing/device-oneplus-instantnoodlep/deviceinfo index 302944ced..cc159e802 100644 --- a/device/testing/device-oneplus-instantnoodlep/deviceinfo +++ b/device/testing/device-oneplus-instantnoodlep/deviceinfo @@ -18,16 +18,14 @@ deviceinfo_screen_height="3168" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_downstream="androidboot.console=ttyMSM0 androidboot.hardware=qcom androidboot.memcg=1 androidboot.usbcontroller=a600000.dwc3 cgroup.memory=nokmem,nosocket loop.max_part=7 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x237 reboot=panic_warm service_locator.enable=1 swiotlb=2048 buildvariant=userdebug printk.devkmsg=on" -deviceinfo_kernel_cmdline_mainline="clk_ignore_unused pd_ignore_unused" +deviceinfo_kernel_cmdline="clk_ignore_unused pd_ignore_unused" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" deviceinfo_flash_pagesize="4096" -deviceinfo_header_version_downstream="0" -deviceinfo_header_version_mainline="2" +deviceinfo_header_version="2" deviceinfo_append_dtb="false" -deviceinfo_dtb_mainline="qcom/sm8250-oneplus-instantnoodlep" +deviceinfo_dtb="qcom/sm8250-oneplus-instantnoodlep" deviceinfo_flash_offset_dtb="0x01f00000" deviceinfo_flash_offset_base="0x00000000" deviceinfo_flash_offset_kernel="0x00008000"