From ccbc7f8a1aedd1951de64eb2485a3eddc7e2ce63 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 4 Jul 2023 21:39:02 +0200 Subject: [PATCH] device-pine64-pinenote: add u-boot-pine64-pinenote dependency (MR 3835) - specify offset to embed the u-boot - change partitions where to flash the kernel and rootfs - add dependency on mainline u-boot that supports extlinux.conf boot records [ci:skip-build] already built successfully in CI --- device/testing/device-pine64-pinenote/APKBUILD | 7 ++++--- device/testing/device-pine64-pinenote/deviceinfo | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/device/testing/device-pine64-pinenote/APKBUILD b/device/testing/device-pine64-pinenote/APKBUILD index 0a9205fe4..bcd248dbb 100644 --- a/device/testing/device-pine64-pinenote/APKBUILD +++ b/device/testing/device-pine64-pinenote/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Petr Hodina pkgname=device-pine64-pinenote pkgdesc="Pine64 PineNote" -pkgver=1 -pkgrel=2 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + u-boot-pine64-pinenote linux-pine64-pinenote postmarketos-base " @@ -63,7 +64,7 @@ nonfree_firmware() { } sha512sums=" -e29807d5a0ae9ed1def7f1a9037bd67f58f40de8a731905c3a2cf5265d4a4bdd201ec7e7004e9c04897732c15144670bdf84b9c40d15f476c8f9dcf820f3b36a deviceinfo +c89fc650361331d0c7fefc444f6170510f56ace4c28ebf1d5a6556af4bf95c96d80c17bc26db0f9eb690f59ab316b48e5523f4720be566617a53fecd0d95c431 deviceinfo 4bf5158fbd53274a7429e825bb66225001f2403a4851e2d6803323b77d9095738ee3e5340ac85baf3e86bb4f47d38af8cbd78d8a5055c59a62f5b06e722e19cb phoc.ini 1123720962c9c8fec3c50302ca6a3dd56e2907dc9eea361a7b8eb4201b042476633d41a0ee4f6ab61d9c60eeccc894f83491ba9fa309a9bce2f1db0b0341d79d local-overrides.quirks ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8 50-touchscreen.conf diff --git a/device/testing/device-pine64-pinenote/deviceinfo b/device/testing/device-pine64-pinenote/deviceinfo index 29f74e05e..50cc1f6dc 100644 --- a/device/testing/device-pine64-pinenote/deviceinfo +++ b/device/testing/device-pine64-pinenote/deviceinfo @@ -26,8 +26,13 @@ deviceinfo_modules_initfs="tps65185-regulator rockchip_ebc drm_kms_helper drm_sh deviceinfo_flash_method="rkdeveloptool" deviceinfo_flash_sparse="true" -deviceinfo_flash_rk_partition_kernel="cache" -deviceinfo_flash_rk_partition_system="userdata" +deviceinfo_boot_part_start="65536" + +deviceinfo_sd_embed_firmware="u-boot/pine64-pinenote/u-boot-rockchip.bin:1" +deviceinfo_sd_embed_firmware_step_size="32768" + +deviceinfo_flash_rk_partition_kernel="boot" +deviceinfo_flash_rk_partition_system="os1" deviceinfo_generate_extlinux_config="true" deviceinfo_kernel_cmdline="drm.debug=0x0 vt.color=0xf earlycon console=tty0 console=ttyS2,1500000n8 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"