summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Johansen <strit@manjaro.org>2020-07-22 11:30:40 +0200
committerDan Johansen <strit@manjaro.org>2020-07-22 11:30:40 +0200
commite449fab059bdd3834cd9971d2ba4294501ed9382 (patch)
tree49b144ad2fe19c08de8e6105fe7c83b964fef571
parent57e9a4c5599e47d0681a9602142fe081abfcef02 (diff)
downloaduboot-pinebook-e449fab059bdd3834cd9971d2ba4294501ed9382.tar.gz
uboot-pinebook-e449fab059bdd3834cd9971d2ba4294501ed9382.tar.bz2
uboot-pinebook-e449fab059bdd3834cd9971d2ba4294501ed9382.zip
update to 2020.07
-rw-r--r--.gitlab-ci.yml9
-rw-r--r--PKGBUILD6
-rw-r--r--extlinux.conf2
-rw-r--r--uboot-pinebook.install5
4 files changed, 15 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..b6524cf
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,9 @@
+build-package:
+ tags:
+ - aarch64
+ script:
+ - sudo pacman -Syy && makepkg -scr --noconfirm
+ artifacts:
+ paths:
+ - ./*.pkg.tar.*
+ expire_in: 1 week
diff --git a/PKGBUILD b/PKGBUILD
index db7d193..17267f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
pkgname=uboot-pinebook
-pkgver=2020.04
+pkgver=2020.07
pkgrel=1
_tfaver=2.3
pkgdesc="U-Boot for Pine64"
@@ -16,9 +16,9 @@ install=${pkgname}.install
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
"https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-$_tfaver.tar.gz"
'extlinux.conf')
-md5sums=('51113d2288c55110e33a895c65ab9f60'
+md5sums=('86e51eeccd15e658ad1df943a0edf622'
'628a32a3c3b3f0c567d1ea6ee5582807'
- '96aebf8a7cca044bb2c765ba8812299b')
+ '7e6fbff584c11762048d9aecdc50b075')
build() {
unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
diff --git a/extlinux.conf b/extlinux.conf
index ac76893..f62d83b 100644
--- a/extlinux.conf
+++ b/extlinux.conf
@@ -1,4 +1,4 @@
LABEL Manjaro ARM
KERNEL /Image
FDT /dtbs/allwinner/sun50i-a64-pinebook.dtb
-APPEND initrd=/initramfs-linux.img console=tty1 console=ttyS0,115200 root=LABEL=ROOT rw rootwait video=eDP-1:1920x1080@60 video=HDMI-A-1:1920x1080@60 bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash
+APPEND initrd=/initramfs-linux.img console=tty1 console=ttyS0,115200 root=LABEL=ROOT rw rootwait bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash
diff --git a/uboot-pinebook.install b/uboot-pinebook.install
index 801363d..2d33ecc 100644
--- a/uboot-pinebook.install
+++ b/uboot-pinebook.install
@@ -1,7 +1,6 @@
flash_uboot() {
- echo "Install new bootloader by running:"
- echo "# dd if=/boot/u-boot-sunxi-with-spl-pinebook.bin of=/dev/mmcblk0 bs=8k seek=1 for Pinebook SD"
- echo "# dd if=/boot/u-boot-sunxi-with-spl-pinebook.bin of=/dev/mmcblk2 bs=8k seek=1 for Pinebook eMMC"
+ echo "A new U-Boot version can be flashed onto your install drive. Please use lsblk to determine your drive, before proceeding."
+ echo "# dd if=/boot/u-boot-sunxi-with-spl-pinebook.bin of=/dev/mmcblkX bs=8k seek=1"
}
## arg 1: the new package version