From 370c78448aa7c1c5922e40c1dbc2a3bf6c161d8a Mon Sep 17 00:00:00 2001 From: Ferass El Hafidi Date: Wed, 7 May 2025 10:08:39 +0000 Subject: [PATCH] soc-amlogic-s905: support booting a uImage or FIT Signed-off-by: Ferass El Hafidi Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6121 --- device/testing/soc-amlogic-s905/APKBUILD | 4 ++-- device/testing/soc-amlogic-s905/s905_autoscript.cmd | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/device/testing/soc-amlogic-s905/APKBUILD b/device/testing/soc-amlogic-s905/APKBUILD index 91522f343..4ecd0602b 100644 --- a/device/testing/soc-amlogic-s905/APKBUILD +++ b/device/testing/soc-amlogic-s905/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: exkc pkgname=soc-amlogic-s905 pkgdesc="Common package for devices using the Amlogic S905 SoC" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -41,6 +41,6 @@ x11() { } sha512sums=" -35d61396507f058c2307660b83b8c6919ed806d5c696563eca96e828cdbb944ed50b27a4548e6a5bec956ec5ddc97f7c0f41766d63d4b61bd051055000b1a5ec s905_autoscript.cmd +fbb3bd2198fd5d95454059b5394484172c27836b54b4a3bb7dc11c65af11aafe615eaed491bdbea34173b12c102eb2319cb491dbcdfff10bdb0ec2c3b31861c3 s905_autoscript.cmd 72267e7bb0e3cd4a7c89d51c046c3a9c93d7ff9fe23a24357088fc94d45c6cc314cf12c8475421eadc507937ebc1ca9b1b9afdec0c78cf39977ebdd5f5eab24d xorg.conf " diff --git a/device/testing/soc-amlogic-s905/s905_autoscript.cmd b/device/testing/soc-amlogic-s905/s905_autoscript.cmd index dcc8ec4cc..39032d746 100644 --- a/device/testing/soc-amlogic-s905/s905_autoscript.cmd +++ b/device/testing/soc-amlogic-s905/s905_autoscript.cmd @@ -2,3 +2,12 @@ if fatload mmc 0 0x1000000 u-boot.bin; then go 0x1000000; fi; if fatload usb 0 0x1000000 u-boot.bin; then go 0x1000000; fi; if ext4load mmc 0 0x1000000 u-boot.bin; then go 0x1000000; fi; if ext4load usb 0 0x1000000 u-boot.bin; then go 0x1000000; fi; +setenv pmos_env_addr 0x1040000 +setenv pmos_env_load 'fatload ${pmos_devtype} ${pmos_devnum} ${pmos_env_addr} uEnv.ini && env import -t ${pmos_env_addr} ${filesize}' +setenv pmos_try_uimage 'if fatload ${pmos_devtype} ${pmos_devnum} ${loadaddr} uImage; then fatload ${pmos_devtype} ${pmos_devnum} ${dtb_mem_addr} ${pmos_env_dtb} && bootm ${loadaddr} - ${dtb_mem_addr}; fi' +setenv pmos_try_fit 'if fatload ${pmos_devtype} ${pmos_devnum} ${loadaddr} boot-image.itb; then bootm ${loadaddr}; fi' +setenv pmos_try_boot 'run pmos_try_fit; run pmos_try_uimage' +setenv pmos_devtype usb +for pmos_devnum in 0 1 2 3 ; do run pmos_env_load && run pmos_try_boot ; done +setenv pmos_devtype mmc +for pmos_devnum in 0 1 2 3 ; do run pmos_env_load && run pmos_try_boot ; done