diff --git a/temp/u-boot-rockpro64/APKBUILD b/temp/u-boot-rockpro64/APKBUILD index 9dcb9f72f..2d4ff1ab7 100644 --- a/temp/u-boot-rockpro64/APKBUILD +++ b/temp/u-boot-rockpro64/APKBUILD @@ -2,7 +2,7 @@ pkgname=u-boot-rockpro64 pkgver=2020.04 -pkgrel=1 +pkgrel=2 pkgdesc="u-boot bootloader for the rk3399" url="https://gitlab.com/pine64-org/u-boot" arch="aarch64" @@ -38,4 +38,4 @@ package() { sha512sums="e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8 u-boot-2020.04.tar.bz2 4495dbaceac1cc42b3506dda81e0920f8eca19e11e0d717637dba6e4623e95cd4c3c94e7fc3aa8f3cbfe5fcaf0c0c109d1699eb7f278a69fa8e209c7cd6e4c02 rk3399-power-led.patch -3fb94ae63b122b85d8a4822bbcfc4e4d12beff1c752dd93e45dc49458dc5ccc5483b1ff3ac8cd628859b9d19fe95aa6b2d050df557ba2715737fa8322833ef6a update-u-boot" +8bd5e4236257f3a971f207ff3ae8f97358e6ec4a110fa14e675bf583e1f1ccacbc1e8d2c887ac66eb64369cd0d6c3beab7643d201592bb0ec1c66c8f27a58fc8 update-u-boot" diff --git a/temp/u-boot-rockpro64/update-u-boot b/temp/u-boot-rockpro64/update-u-boot index 52a2bc0f4..f4989d281 100644 --- a/temp/u-boot-rockpro64/update-u-boot +++ b/temp/u-boot-rockpro64/update-u-boot @@ -9,17 +9,13 @@ imagedir= 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,pinebook-pro*) board=pinebookpro ;; pine64,rockpro64*) board=rockpro64 ;; esac fi if [ -z "$device" ]; then case "$board" in - wand|cubie|cubie2) device=/dev/mmcblk0p0 ;; - mx6cuboxi) device=/dev/mmcblk0 ;; - pinebookpro|rockpro64) device=/dev/mmcblk2 ;; + rockpro64) device=/dev/mmcblk2 ;; esac fi @@ -42,7 +38,7 @@ usage: $0 [-n,--dry-run] [-i,--imagedir ] [-b|--board ] [- options: - -b,--board Specify the board type: wand, cubie, cubie2, cuboxi, pinebookpro, rockpro64 + -b,--board Specify the board type: rockpro64 (current default: ${board:-none}) -d,--device Specify the device where to install u-boot @@ -62,10 +58,6 @@ while [ $# -gt 0 ]; do case "$opt" in -b|--board) case "$1" in - wand|wandboard) board="wand" ;; - cubie|cubieboard) board="cubie" ;; - cuboxi|mx6cuboxi) board="mx6cuboxi" ;; - pinebookpro) board="pinebookpro" ;; rockpro64) board="rockpro64" ;; *) usage; exit 1;; esac @@ -106,21 +98,7 @@ fi ( set -e case "$board" in -wand) - [ -e "$imagedir/wandboard" ] || die "wandboard images not installed, apk add u-boot-wandboard" - $dryrun dd if=$imagedir/wandboard/SPL of=$device bs=1k seek=1 status=none - $dryrun dd if=$imagedir/wandboard/u-boot.img of=$device bs=1k seek=69 status=none - ;; -cubie|cubie2) - [ -e "$imagedir/Cubieboard${board#cubie}" ] || die "Cubieboard images not installed, apk add u-boot-cubieboard" - $dryrun dd if=$imagedir/Cubieboard${board#cubie}/u-boot-sunxi-with-spl.bin of=$device bs=1024 seek=8 status=none - ;; -mx6cuboxi) - [ -e "$imagedir/mx6cuboxi" ] || die "iMX6 Cubox-i images not installed, apk add u-boot-cuboxi" - $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 - ;; -pinebookpro|rockpro64) +rockpro64) [ -e "$imagedir/pine64-rockpro64/" ] || die "rockpro64 images not installed, apk add u-boot-rockpro64" $dryrun dd if=$imagedir/pine64-rockpro64/u-boot-rockchip.bin of=$device bs=1024 seek=32 status=none ;;