From e47f97d24810421586f03270cde2126c570c0132 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 20 Jan 2020 16:00:16 -0800
Subject: Updated to build from source Added missing python makedepend

---
 PKGBUILD | 63 +++++++++++++++++++++------------------------------------------
 1 file changed, 21 insertions(+), 42 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index e995676..97c2000 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,5 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
 # Maintainer (Manjaro): Dan Johansen <strit@manjaro.org>
-# Contributor (Manjaro): Spikerguy <tech@fkardame.com>
 # Contributor (Manjaro): Kevin Mihelich 
 # Contributor (Manjaro): Adam <adam900710@gmail.com>
 
@@ -9,63 +8,43 @@
 # Manjaro version fails to build
 
 pkgname=uboot-pinebookpro
-pkgver=2017.09
-pkgrel=2
-pkgdesc="U-Boot for Pinebook Pro - MrFixit2001's source tree"
-#arch=('aarch64')
-arch=('x86_64')
-url='http://www.denx.de/wiki/U-Boot/WebHome'
+pkgver=2020.01
+pkgrel=4
+pkgdesc="U-Boot for Pinebook Pro"
+arch=('aarch64')
+#arch=('x86_64')
+url='https://git.eno.space/pbp-uboot'
 license=('GPL')
 backup=('boot/boot.txt' 'boot/boot.scr')
 depends=('uboot-tools')
-makedepends=('bc' 'git' 'rockchip-tools' 'python' 'dtc')
+makedepends=('arm-none-eabi-gcc' 'bc' 'dtc' 'git' 'python')
 install=${pkgname}.install
-_commit_rkbin=0d4740f2c0c897ebc1a074580376689b8454ddd8
-_commit_uboot=183e247f9022f934a2224ce71f3030447068c32c
-source=("git+https://github.com/mrfixit2001/rockchip-u-boot.git#commit=$_commit_uboot"
-        "git+https://github.com/rockchip-linux/rkbin.git#commit=$_commit_rkbin"
-        "0001-nvme-support.patch"
-        'rk3399trust.ini'
+_commit_atf=22d12c4148c373932a7a81e5d1c59a767e143ac2
+source=("git+https://git.eno.space/pbp-uboot.git"
+        "git+https://github.com/ARM-software/arm-trusted-firmware.git#commit=$_commit_atf"
         'boot.txt'
         'mkscr')
 b2sums=('SKIP'
         'SKIP'
-        '8b63d5ac418d5fe0fc4df35086ce437f228bcd087ca63625c0e4c2670d106b8eaa6bd54f325f3cfdce16b91ed697205d8dba32c8c78a506f9bdffd12e94dde34'
-        'd2e62e9d4950c89c5597590adbb399d615414d634c607c3c9a70a90ccee451b85b6563b7f568c668395e1e843821323fce48e03fe35aa2f5a211e4ae08d7e2ab'
         'cf03a62fd803187ab91db0942a5d7f835ffcf75c3b0b6ab8ca8c3e8a6762b328339580f3a80eeb1569bf4bca87a9cd60a83c3713338af2de4244717177c8d363'
         '4ea782264696aa85e30847413088bd338e2beb2ec4e57c2808f80af28ac613ab4ae82b37eb0ff902e66f8a12082a1f9a546bbf20dfeb4c43f59f465987043ede')
-prepare() {
-  cd rockchip-u-boot
-  patch -Np1 -i "${srcdir}/0001-nvme-support.patch"
-  sed -i 's/KBUILD_CFLAGS	+= -fshort-wchar -Werror/KBUILD_CFLAGS	+= -fshort-wchar/' Makefile
-}
 
 build() {
-  cd rockchip-u-boot
-
-  unset CLFAGS CXXFLAGS CPPFLAGS LDFLAGS
-
-  make pinebookpro-rk3399_defconfig
-
-  sed -i 's/CONFIG_IDENT_STRING=""/CONFIG_IDENT_STRING=" Manjaro ARM"/' .config
-  make EXTRAVERSION=-${pkgrel}
-
+  cd arm-trusted-firmware
+  unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+  make PLAT=rk3399
+  cd ../pbp-uboot
+  unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+  make pinebook_pro-rk3399_defconfig
+  echo 'CONFIG_IDENT_STRING=" Arch Linux ARM"' >> .config
+  make BL31=../arm-trusted-firmware/build/rk3399/release/bl31/bl31.elf EXTRAVERSION=-${pkgrel}
 }
 
 package() {
-  cd rockchip-u-boot
+  cd pbp-uboot
 
   mkdir -p "${pkgdir}/boot"
-
-  tools/mkimage -n rk3399 -T rksd -d ../rkbin/bin/rk33/rk3399_ddr_800MHz_v1.23.bin "${pkgdir}/boot/idbloader.img"
-  cat ../rkbin/bin/rk33/rk3399_miniloader_v1.19.bin >> "${pkgdir}/boot/idbloader.img"
-
-  loaderimage --pack --uboot u-boot-dtb.bin "${pkgdir}/boot/uboot.img" 0x200000
-
-  trust_merger ../rk3399trust.ini
-
-  cp trust.img "${pkgdir}/boot"
-
-  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}/boot/boot.scr"
+  cp idbloader.img u-boot.itb  "${pkgdir}/boot"
+  mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ${srcdir}/boot.txt "${pkgdir}/boot/boot.scr"
   cp ${srcdir}/{boot.txt,mkscr} "${pkgdir}"/boot
 }
-- 
cgit v1.2.1