From cef25071a24dfef179ebf03d42681316020204e3 Mon Sep 17 00:00:00 2001 From: mint Date: Fri, 18 Mar 2022 17:59:50 -0300 Subject: [PATCH] desperate attempts to get downstream booting --- device-xiaomi-laurel_sprout/APKBUILD | 2 +- device-xiaomi-laurel_sprout/deviceinfo | 3 ++- linux-xiaomi-laurel_sprout/APKBUILD | 11 +++++++++-- .../config-xiaomi-laurel_sprout.aarch64 | 7 ++++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/device-xiaomi-laurel_sprout/APKBUILD b/device-xiaomi-laurel_sprout/APKBUILD index 072a493..ea861e7 100644 --- a/device-xiaomi-laurel_sprout/APKBUILD +++ b/device-xiaomi-laurel_sprout/APKBUILD @@ -25,5 +25,5 @@ package() { } sha512sums=" -cda2fb3830dd86c1d56aa7936851aecb9fbe21450a633042b6fd8260761ce4667940a49e4eabcfe6cc821bd988797d18973852510531c76468174d9d1b6945f6 deviceinfo +b665ab8d583a4d261b9aed7c9442db519827fe32a66346b770bd12e958ac5e72531e0117dc4f3af99296c097c5e80d5a5e6b71b5c6e91b4576f95feebf48b78b deviceinfo " diff --git a/device-xiaomi-laurel_sprout/deviceinfo b/device-xiaomi-laurel_sprout/deviceinfo index a860e04..a714d2a 100644 --- a/device-xiaomi-laurel_sprout/deviceinfo +++ b/device-xiaomi-laurel_sprout/deviceinfo @@ -22,7 +22,8 @@ deviceinfo_getty="ttyMSM0;115200" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" +deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" +deviceinfo_flash_fastboot_partition_dtbo="dtbo" deviceinfo_flash_sparse="true" deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.hardware=qcom androidboot.console=ttyMSM0 user_debug=31 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=1 earlycon=msm_geni_serial,0x4a90000 loop.max_part=7 cgroup.memory=nokmem,nosocket androidboot.selinux=permissive buildvariant=eng" deviceinfo_generate_bootimg="true" diff --git a/linux-xiaomi-laurel_sprout/APKBUILD b/linux-xiaomi-laurel_sprout/APKBUILD index 7a45e8b..778ff1c 100644 --- a/linux-xiaomi-laurel_sprout/APKBUILD +++ b/linux-xiaomi-laurel_sprout/APKBUILD @@ -12,15 +12,17 @@ url="https://kernel.org" license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native" makedepends=" + android-mkdtimg bash bc bison + clang devicepkg-dev + dtc flex openssl-dev linux-headers perl - clang " # Source @@ -52,6 +54,11 @@ build() { package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" + + dtbodir="$builddir/$_outdir/arch/arm64/boot/dts/qcom" + mkdtimg create "$pkgdir/boot/dtbo.img" --page_size=4096 \ + "$dtbodir/laurel_sprout-qrd-overlay.dtbo" + # Modules unset LDFLAGS make O="$_outdir" ARCH="$_carch" CC="clang" \ @@ -61,7 +68,7 @@ package() { sha512sums=" 2cebedae30ffc2ff16b5f8d6b93f7edeb7d28e88cbecdf7835dcdd3ceaabc61a3b5aee3085fea385e4644aaadd371e0109356eb0a21135d97fcfe6bf6a4c8b04 linux-xiaomi-laurel_sprout-18cce7c37b08cf3b8cb013ac648f03a7361ac215.tar.gz -1fa7cf1fac645f284a741eabd9868b7f160eb01ec07d906d0df64fb42555560db72434a1a638c2eaeb104ea70b7ba4486b65be132c5deb102e192351ed455e7e config-xiaomi-laurel_sprout.aarch64 +99e17b15f9682a0a5ac2c52bfddf236a8c5db041c58308d95542e96e631840776bb2fd2b91f51cc2cf7e638461a68553fea3e6bc4a538bda86ccb2de030ede1f config-xiaomi-laurel_sprout.aarch64 e2a7a404a7bd404dbda08663ca5f96c38e04e58bd781024c6904115a4775e089775a552583347ab8e2f745d5ab5653a63c08070b3b43b8b4a2f23696e747311e 0001-always_boot_to_initramfs.patch 65048fb6474fd543b14bc99d9d95cfe5297da239af211d327a8509f7777d489bd01dd911364e0c62ec0e68f4c22ebb3b145eabfe01cad2abf57cf46896a1e58f 0002-disable_skip_initramfs.patch 9ce867c4254b537ef5d2485780c26b72da8a3a8767ba71557f3b48d6c550e0e14c8c3e575b31bf65d2878f08a8a4926e48a1c2f1be534bf80a7a57f58313b0fd 0003-remove_bootloader_cmdline_opts.patch diff --git a/linux-xiaomi-laurel_sprout/config-xiaomi-laurel_sprout.aarch64 b/linux-xiaomi-laurel_sprout/config-xiaomi-laurel_sprout.aarch64 index c1e8ec9..7e7fd21 100644 --- a/linux-xiaomi-laurel_sprout/config-xiaomi-laurel_sprout.aarch64 +++ b/linux-xiaomi-laurel_sprout/config-xiaomi-laurel_sprout.aarch64 @@ -702,13 +702,14 @@ CONFIG_CMDLINE="" # CONFIG_EFI is not set CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y CONFIG_IMG_GZ_DTB=y +# CONFIG_IMG_DTB is not set +CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb" +CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES="" CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y # CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set # CONFIG_KRYO_PMU_WORKAROUND is not set -CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb" -CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES="" CONFIG_BOOT_INFO=y -# CONFIG_BUILD_ARM64_DT_OVERLAY is not set +CONFIG_BUILD_ARM64_DT_OVERLAY=y # # Userspace binary formats