diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD index d9dcf33886b8c6a4118719a985e24f5f42e86ef2..6733fe4ff8bbd951839b85445319579e64738ded 100644 --- a/main/u-boot/APKBUILD +++ b/main/u-boot/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=u-boot pkgver=2023.04 -pkgrel=4 +pkgrel=5 pkgdesc="u-boot bootloader common files" url="https://www.denx.de/wiki/U-Boot/" arch="all !s390x !ppc64le" @@ -66,7 +66,7 @@ aarch64) board_configs=" libretech:libretech-cc rockchip:rockpro64-rk3399,roc-pc-rk3399,roc-cc-rk3328,pinebook-pro-rk3399 qemu:qemu_arm64 - sunxi:pine64-lts,pinebook,orangepi_3,teres_i,a64-olinuxino,a64-olinuxino-emmc,nanopi_neo2 + sunxi:pine64-lts,pinebook,orangepi_3,teres_i,a64-olinuxino,a64-olinuxino-emmc,nanopi_neo2,pine64_plus ";; riscv64) board_configs=" qemu:qemu-riscv64,qemu-riscv64_smode @@ -96,7 +96,7 @@ build() { msg "Building u-boot for $board" case "$board" in - "pine64-lts"|"pinebook"|"teres_i"|"a64-olinuxino"|"a64-olinuxino-emmc") + "pine64-lts"|"pinebook"|"teres_i"|"a64-olinuxino"|"a64-olinuxino-emmc"|"pine64_plus") export BL31="/usr/share/arm-trusted-firmware/sun50i_a64/bl31.bin" export SCP=/dev/null;; "orangepi_3") @@ -196,7 +196,7 @@ done sha512sums=" 31a44083af8084cd657c08233f485ff9503002bbaf95114c6135d483881fa14dc5a1b7ab42fd91f1fdd6b330556e76958d475280115018cb59c62b6ab4b508e6 u-boot-2023.04.tar.bz2 f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1 README.txt -2be9f81957cbf7a772745b043ed60217000a17bfad6236a5eac1a282e99d609b9ae04bc541dd8d80ab9e5b26c99f5de76fb5a556fd93c0b04ae03bd59071ec15 update-u-boot +0efd75c96755c4b20d2755c147e98d12f48d0790495e8e8cf6c397bfe8e24e690ab7dabcb3abe4c6259d120c25dcf4a519fdc15ac53b0d2254a7ef9451af8cd0 update-u-boot 83fc42c698f8236ba1f7d71383863e0bda255ada85bb885856a24b2036944d230d918a9d965d5ff90720726c9ee85ffda5e88eefc27b94ef9e7b4f456dcfb195 fix-tools-build.patch 72efbc68fa98448b7cfe509c45fd934baf27810bcbde758f64bc1faa141287a0a18c54f5c60335e68438a57e3826e91c30b740c12eedd7d360ff28eb1d41c235 0001-Revert-mmc-s5p_sdhci-unset-the-SDHCI_QUIRK_BROKEN_R1.patch fcf0b66fb7ec8868a971551bb2ae7bfe8f3cb1ba28513f7a34d13e937543fb993a78419a9f1faf890c8dadb7c5ee088e95b40f1f6522f4efa9e87a2014dfacf2 0002-samsung-common-only-load-CROS_EC-if-enabled-in-confi.patch diff --git a/main/u-boot/update-u-boot b/main/u-boot/update-u-boot index 056bee7ed5cf16325a8d74c5cb6f762605bb04b1..5f148c0a54f7e8cc300f9f563fdea78b999e6413 100755 --- a/main/u-boot/update-u-boot +++ b/main/u-boot/update-u-boot @@ -10,13 +10,14 @@ get_defaults() { if [ -z "$board" -a -e /sys/firmware/devicetree/base/compatible ]; then case "$(cat /sys/firmware/devicetree/base/compatible 2>/dev/null)" in wand,*) board=wand ;; + pine64,pine64-plus*) board=pine64_plus ;; esac fi if [ -z "$device" ]; then case "$board" in wand|cubie|cubie2) device=/dev/mmcblk0p0 ;; - mx6cuboxi|*rk33*) device=/dev/mmcblk0 ;; + mx6cuboxi|*rk33*|pine64_plus) device=/dev/mmcblk0 ;; esac fi @@ -62,7 +63,7 @@ while [ $# -gt 0 ]; do wand|wandboard) board="wand" ;; cubie|cubieboard) board="cubie" ;; cuboxi|mx6cuboxi) board="mx6cuboxi" ;; - pine64-lts|pinebook|orangepi_3|teres_i|a64-olinuxino|a64-olinuxino-emmc|nanopi_neo2|*rk33*) board="$1" ;; + pine64-lts|pinebook|orangepi_3|teres_i|a64-olinuxino|a64-olinuxino-emmc|nanopi_neo2|*rk33*|pine64_plus) board="$1" ;; *) usage; exit 1;; esac shift @@ -116,7 +117,7 @@ mx6cuboxi) $dryrun dd if=$imagedir/mx6cuboxi/SPL of=$device bs=1k seek=1 status=none $dryrun dd if=$imagedir/mx6cuboxi/u-boot.img of=$device bs=1k seek=69 status=none ;; -pine64-lts|pinebook|orangepi_3|teres_i|a64-olinuxino|a64-olinuxino-emmc|nanopi_neo2) +pine64-lts|pinebook|orangepi_3|teres_i|a64-olinuxino|a64-olinuxino-emmc|nanopi_neo2|pine64_plus) [ -e "$imagedir/$board" ] || die "sunxi images not installed, apk add u-boot-sunxi" $dryrun dd if=$imagedir/$board/u-boot-sunxi-with-spl.bin of=$device bs=1k seek=8 status=none ;;