diff --git a/PKGBUILDS/pine64/uboot-pinephone/PKGBUILD b/PKGBUILDS/pine64/uboot-pinephone/PKGBUILD index 2d44749c..f2ae3280 100644 --- a/PKGBUILDS/pine64/uboot-pinephone/PKGBUILD +++ b/PKGBUILDS/pine64/uboot-pinephone/PKGBUILD @@ -5,15 +5,13 @@ buildarch=8 pkgname=uboot-pinephone pkgver=2022.01 -pkgrel=4 +pkgrel=5 pkgdesc="U-Boot for PinePhone" arch=('aarch64') url='http://www.denx.de/wiki/U-Boot/WebHome' license=('GPL') -depends=('uboot-tools') # we need this for mkscr makedepends=('bc' 'python' 'swig' 'dtc' 'python-setuptools') install=${pkgname}.install -backup=("boot/boot.txt") _commit_atf="d005bfcdff423fc84f03c657e0dcdb4b45621b22" @@ -23,8 +21,6 @@ source=("https://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2" '0001-expose-DRAM-clock-speed.patch' 'Improve-Allwinner-A64-timer-workaround.patch' 'Add-volume_key-environment-variable.patch' - 'boot.txt' - 'mkscr' 'update-u-boot' 'scp.bin') md5sums=('49ba74a214d14c6340c8067bc1ed5fa0' @@ -33,8 +29,6 @@ md5sums=('49ba74a214d14c6340c8067bc1ed5fa0' '061a510280d16bddf16679cf0d23bf6e' '98ad5f31b1d7ff2e6e03555f29ebc6e6' 'fb9def68f0b44c69f88f7923e21379cc' - '06c27a80909035513aac45036e8d954b' - '021623a04afd29ac3f368977140cfbfd' 'c251a9b0601caa3dd6b805aa0889660f' '90616d501a12d6f7a12c4349f789c343') @@ -132,6 +126,5 @@ package() { cp u-boot-sunxi-with-spl-pinetab{-624,-552,-528,-492}.bin "${pkgdir}"/boot cp u-boot-sunxi-with-spl-pinephone{-624,-552,-528,-492}.bin "${pkgdir}"/boot - cp ../boot.txt ../mkscr "${pkgdir}"/boot mkdir -p "${pkgdir}"/usr/bin && cp ../update-u-boot "${pkgdir}"/usr/bin } diff --git a/PKGBUILDS/pine64/uboot-pinephone/boot.txt b/PKGBUILDS/pine64/uboot-pinephone/boot.txt deleted file mode 100644 index d18bc5bb..00000000 --- a/PKGBUILDS/pine64/uboot-pinephone/boot.txt +++ /dev/null @@ -1,50 +0,0 @@ -gpio set 98 # Enable vibrator - -if test ${devnum} -eq 0; then - echo "Booting from SD" - setenv linux_mmcdev 0 -else - echo "Booting from eMMC" - setenv linux_mmcdev 2 -fi - -# If we have at least 2 partitions, then the 1st one is /boot, and / is #2 -if part size mmc ${devnum} 2 none; then - setenv rootpart 2 -else - setenv rootpart 1 - setenv bootdir "/boot" -fi - -setenv bootargs loglevel=4 console=${console} console=tty0 root=/dev/mmcblk${linux_mmcdev}p${rootpart} rw rootwait quiet bootsplash.bootfile=bootsplash-themes/danctnix/bootsplash - -echo "Loading kernel..." -load mmc ${devnum}:1 ${ramdisk_addr_r} ${bootdir}/Image.gz - -echo "Uncompressing kernel..." -unzip ${ramdisk_addr_r} ${kernel_addr_r} - -echo "Loading initramfs..." -load mmc ${devnum}:1 ${ramdisk_addr_r} ${bootdir}/initramfs-linux.img -setenv ramdisk_size ${filesize} - -echo "Loading dtb..." -load mmc ${devnum}:1 ${fdt_addr_r} ${bootdir}/dtbs/${fdtfile} - -echo Resizing FDT -fdt addr ${fdt_addr_r} -fdt resize - -echo Adding FTD RAM clock -fdt mknode / memory -fdt set /memory ram_freq ${ram_freq} -fdt list /memory - -echo Loading user script -setenv user_scriptaddr 0x61dbc200 -load mmc ${devnum}:1 ${user_scriptaddr} ${bootdir}/user.scr -if test $? -eq 0; then source ${user_scriptaddr}; else echo No user script found; fi - -echo "Booting..." -gpio clear 98 # Disable vibrator -booti ${kernel_addr_r} ${ramdisk_addr_r}:0x${ramdisk_size} ${fdt_addr_r} diff --git a/PKGBUILDS/pine64/uboot-pinephone/mkscr b/PKGBUILDS/pine64/uboot-pinephone/mkscr deleted file mode 100755 index 272b6a7a..00000000 --- a/PKGBUILDS/pine64/uboot-pinephone/mkscr +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [[ ! -x /usr/bin/mkimage ]]; then - echo "mkimage not found. Please install uboot-tools:" - echo " pacman -S uboot-tools" - exit 1 -fi - -mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr