device-oneplus-lemonade: use boot image header v1

Using header v1 and appended dtb simplifies a lot of things. It now
requires flashing dtbo with an empty file of at least 2 bytes, erasing
it might also work. As well as erasing vendor_boot.

It may still be necessary to flash vbmeta.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>

device/community/device-shift-axolotl/APKBUILD

@@ -4,8 +4,8 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=11
-pkgrel=0
+pkgver=9999
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,6 +46,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-95ba2e272e3a613c713fa150d44ba24acc8e96e307b8e2d92ec1d206a9ad03e54bf962dddda38d00a95c27c09b10ffb8e13b039594783132ee6963803b89767c  deviceinfo
+71e4ca72615e85300f2ab48585c9bb5ada0af89957a27d293ba8f39380afafaf0efa11762ee541113844dacb7ce30ce001e541c78a584852a45021896e25e071  deviceinfo
 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51  q6voiced.conf
 "

device/community/device-shift-axolotl/deviceinfo

@@ -20,7 +20,8 @@ deviceinfo_screen_height="2160"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=null"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"

device/testing/device-oneplus-lemonade/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-lemonade
 pkgdesc="OnePlus 9 & 9 Pro"
-pkgver=0.2
+pkgver=0.3
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
@@ -49,7 +49,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-69666f895a4e8f0d9d87d0f1e37a7bdb62f08880151deb7450d3f774ec7fb61a1b1b263588e90bd403c3961d74d57e2c256ee02e3ef07e771700b57b94292f8a  deviceinfo
+587bc143fe18bf993d9ca4668d9f5c1b25eb7fe1d693f8f6051de4bb0454545e3e5c29ae89bef5d4b113e33e6ea508659f5f2019a500848f4e0cb41ddd6c2eb6  deviceinfo
 cf3bde87540de9a94d253ab211ca9d6ca426e062237db3ab6ec5dfcdb35c161fdfc22837ca696dd27ee5a371157186a5e65b8de33dcc69ce49b7a9584fdce51c  empty-oneplus-lemonade.dts
-cd5d0daff0f156c6f8e2b987a84199cf6d6cd4190b4e91f81465230d9a39f8dba6e25b1aa995b9da829ba940fcf25c43f5c32ae0c041f16901e343dabcf332b8  empty-oneplus-lemonadep.dts
+b79456fa9dbfe5d8ac0564bcfea9a0242a452fde5e0034e471843aa078f71ca4962052a59fc52ca89b0c13fd16b203c8365a81e0295705c048abeca5e183ddc0  empty-oneplus-lemonadep.dts
 "

device/testing/device-oneplus-lemonade/deviceinfo

@@ -29,7 +29,7 @@ deviceinfo_flash_sparse="true"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
 deviceinfo_flash_fastboot_partition_dtbo="dtbo"
 deviceinfo_flash_fastboot_partition_system="super"
-deviceinfo_header_version="2"
+deviceinfo_header_version="1"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_dtb="0x01f00000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -37,4 +37,5 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00000000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_rootfs_image_sector_size="4096"
-deviceinfo_append_dtb="false"
+deviceinfo_append_dtb="true"
+

device/testing/device-oneplus-lemonade/empty-oneplus-lemonadep.dts

@@ -13,3 +13,4 @@
 &apps_rsc {
     compatible = "qcom,rpmh-rsc";
 };
+