diff --git a/device/testing/device-librecomputer-lafrite/APKBUILD b/device/testing/device-librecomputer-lafrite/APKBUILD index 3512ad666..df17adf73 100644 --- a/device/testing/device-librecomputer-lafrite/APKBUILD +++ b/device/testing/device-librecomputer-lafrite/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ferass El Hafidi pkgname=device-librecomputer-lafrite pkgdesc="Libre Computer AML-S805X-AC-V1.0" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,7 +12,6 @@ depends=" linux-postmarketos-amlogic postmarketos-base soc-amlogic-s905 - u-boot-librecomputer-lafrite " makedepends="devicepkg-dev" source=" @@ -36,6 +35,6 @@ nonfree_firmware() { } sha512sums=" -604613ffd6b9cabafacc868fb13e4a70849070df534ed646d517af721ffc9b7cbb73638b4934924b366cc9f7bdb05d10a664e3c88855ee52ba78c01895e11069 deviceinfo +84a0ac6e3f0ab540cb274aa5557e30f2a500e367bfcddcc192a2bf809db079910ba73619469287399a1243d69291710af76f6507fc9122d8f6ff1533c54450bd deviceinfo 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8 modules-initfs " diff --git a/device/testing/device-librecomputer-lafrite/deviceinfo b/device/testing/device-librecomputer-lafrite/deviceinfo index 28cbd15b5..5cc9eac33 100644 --- a/device/testing/device-librecomputer-lafrite/deviceinfo +++ b/device/testing/device-librecomputer-lafrite/deviceinfo @@ -22,7 +22,4 @@ deviceinfo_screen_height="600" deviceinfo_flash_method="none" deviceinfo_boot_filesystem="fat32" deviceinfo_generate_extlinux_config="true" -deviceinfo_sd_embed_firmware_step_size="512" -deviceinfo_sd_embed_firmware="u-boot/librecomputer-lafrite/u-boot.bin.sd-stripped.bin:1" -deviceinfo_boot_part_start="4096" deviceinfo_kernel_cmdline="quiet loglevel=2" diff --git a/device/testing/u-boot-librecomputer-lafrite/APKBUILD b/device/testing/u-boot-librecomputer-lafrite/APKBUILD deleted file mode 100644 index 3abf4d856..000000000 --- a/device/testing/u-boot-librecomputer-lafrite/APKBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Reference: -# Maintainer: Ferass El Hafidi -pkgname=u-boot-librecomputer-lafrite -pkgver=2023.04 -pkgrel=1 -pkgdesc="U-Boot bootloader for Libre Computer AML-S805X-AC-V1.0" -url="https://source.denx.de/u-boot" -arch="aarch64" -license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs - ISC LGPL-2.0-only LGPL-2.1-only X11 proprietary" -makedepends="$depends_dev - bc - bison - dtc - flex - openssl-dev - py3-setuptools - python3-dev - swig - bash - " -options="!check" -# https://u-boot.readthedocs.io/en/latest/board/amlogic/pre-generated-fip.html -_amlogicblob_commit="e96b6a694380ff07d5a9e4be644ffe254bd18512" -source=" - https://source.denx.de/u-boot/u-boot/-/archive/v$pkgver/u-boot-v$pkgver.tar.gz - amlogicblobs.tar.gz::https://github.com/LibreELEC/amlogic-boot-fip/archive/$_amlogicblob_commit.tar.gz -" -builddir="$srcdir/u-boot-v$pkgver" -_fipbuilddir="$srcdir/amlogic-boot-fip-$_amlogicblob_commit" - -build() { - touch include/config.h - LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h - LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h - - make libretech-ac_defconfig - make all - cd $_fipbuilddir - mkdir build - ./build-fip.sh lafrite $builddir/u-boot.bin ./build - cd ./build - dd if=u-boot.bin.sd.bin of=u-boot.bin.sd-stripped.bin conv=fsync,notrunc bs=512 skip=1 -} - -package() { - _installdir="$pkgdir/usr/share/u-boot/librecomputer-lafrite" - install -Dm644 "$_fipbuilddir/build/u-boot.bin.sd-stripped.bin" -t "$_installdir" - install -Dm644 "$_fipbuilddir/build/u-boot.bin.sd.bin" -t "$_installdir" - install -Dm644 "$_fipbuilddir/build/u-boot.bin" -t "$_installdir" - install -Dm644 "$_fipbuilddir/build/u-boot.bin.usb.bl2" -t "$_installdir" - install -Dm644 "$_fipbuilddir/build/u-boot.bin.usb.tpl" -t "$_installdir" -} - -sha512sums=" -52a81c3733c7b8a3e95227e1ad2f7315851c0eba14f44576ba4a320897cdc387b763323ec0a750ee111ddd82e9333e834f01e097bf4840d08eab9185427c3fba u-boot-v2023.04.tar.gz -98ecbbc56e8326ce11db4e316a7bb3812d713fbe630235825ddb657b28419eb406f7117208a5c0360653ebdccb9af1a48357d0c257cd61f11a8c3cdaa78548b5 amlogicblobs.tar.gz -"