diff --git a/device-xiaomi-angelican/APKBUILD b/device-xiaomi-angelican/APKBUILD index ac1f8f5..a0af00d 100644 --- a/device-xiaomi-angelican/APKBUILD +++ b/device-xiaomi-angelican/APKBUILD @@ -33,7 +33,7 @@ package() { } sha512sums=" -379bedefb8168f1131d027a13fec4d1e5857bece655d05e496b2cf634bdb050103a5828b1687040261b51245671fb67c19f0ce2e3cad1a48c6a8b303402057a8 deviceinfo +1899f05fbfa569cb8b37af5b639e6b2c809e0c8a3effe4cb119c41415e970fc157055fa98c222552feaf05313148b588d3f0fb2ec6813f59dfad1ecaeda1d8f1 deviceinfo 87a1e3b1f31a7a2717992621eaad272d8ad7e2dca7346e7fcd583e70eb73d817bcfc32b51c322e19ccf575fa0ef3ea7f6279e3176abc4db0c5d49336b9971d05 BT_FW.cfg 3f973f1ae3f24dd9aa087976cc5965aad41c4a0065f69b3e20c1ebe44e34ee2821312f9610b0c8db6b7b6782cb196afca557f86819514e3873d0be468c588ef4 Himax_firmware.bin 43bea79d5af5ada68eb96b5947c88f385f15d7691c6868bf54dcc31ca7175b037422d7e19065b2e24a511de6d60082b11676b7e8e0b3dccbc66a09c1d64e1f1d Himax_mpfw.bin diff --git a/device-xiaomi-angelican/deviceinfo b/device-xiaomi-angelican/deviceinfo index 288bf5e..f295af1 100644 --- a/device-xiaomi-angelican/deviceinfo +++ b/device-xiaomi-angelican/deviceinfo @@ -7,7 +7,7 @@ deviceinfo_name="Xiaomi Redmi 9C NFC" deviceinfo_manufacturer="Xiaomi" deviceinfo_codename="xiaomi-angelican" deviceinfo_year="2020" -deviceinfo_dtb="mediatek/mt6765 mediatek/angelican" +deviceinfo_dtb="mediatek/merged" deviceinfo_modules_initfs="" deviceinfo_arch="aarch64" @@ -20,8 +20,7 @@ deviceinfo_screen_height="1600" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 -androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug kpti=off" +deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug kpti=off" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_mtk_mkimage="false" diff --git a/linux-xiaomi-angelican/APKBUILD b/linux-xiaomi-angelican/APKBUILD index 6803995..310a575 100644 --- a/linux-xiaomi-angelican/APKBUILD +++ b/linux-xiaomi-angelican/APKBUILD @@ -53,9 +53,11 @@ package() { make dtbs_install O="$_outdir" ARCH="$_carch" \ INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs - make modules_install O="$_outdir" ARCH="$_carch" \ - INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs \ - INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 + make modules_install O="$_outdir" ARCH="$_carch" \ + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs \ + INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 + + cat "$pkgdir"/boot/dtbs/mediatek/*.dtb > "$pkgdir"/boot/dtbs/mediatek/merged.dtb } sha512sums="