From 0af9e0dfb65ace536e438c7b5af7e4ccfab3a694 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 12 Dec 2018 06:57:00 +0000
Subject: [PATCH] ATF tweaks and fixes, Enable amarula_a64_relic, nanopi_a64,
 puma-rk3399

---
 aarch64-boards   |  7 +++++--
 uboot-tools.spec | 14 +++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/aarch64-boards b/aarch64-boards
index a65e72b..a744097 100644
--- a/aarch64-boards
+++ b/aarch64-boards
@@ -1,4 +1,5 @@
 a64-olinuxino
+amarula_a64_relic
 avnet_ultra96_rev1
 bananapi_m64
 dragonboard410c
@@ -12,10 +13,11 @@ geekbox
 hikey
 khadas-vim
 khadas-vim2
-libretech-cc
 libretech_all_h3_cc_h5
+libretech-cc
 mvebu_espressobin-88f3720
 mvebu_mcbin-88f8040
+nanopi_a64
 nanopi-k2
 nanopi_neo2
 nanopi_neo_plus2
@@ -30,11 +32,12 @@ orangepi_zero_plus2
 p212
 p2371-2180
 p2771-0000-500
-pine_h64
 pine64-lts
 pine64_plus
 pinebook
+pine_h64
 poplar
+puma-rk3399
 rock960-rk3399
 rpi_3
 sopine_baseboard
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 814c0ac..d079327 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -2,7 +2,7 @@
 
 Name:      uboot-tools
 Version:   2019.01
-Release:   0.1%{?candidate:.%{candidate}}%{?dist}
+Release:   0.2%{?candidate:.%{candidate}}%{?dist}
 Summary:   U-Boot utilities
 License:   GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:       http://www.denx.de/wiki/U-Boot
@@ -133,17 +133,17 @@ do
   echo "Building board: $board"
   mkdir builds/$(echo $board)/
   # ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
-  sun50i=(a64-olinuxino bananapi_m64 libretech_all_h3_cc_h5 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64_plus sopine_baseboard)
+  sun50i=(a64-olinuxino amarula_a64_relic bananapi_m64 nanopi_a64 orangepi_win pine64-lts pine64_plus pinebook sopine_baseboard libretech_all_h3_cc_h5 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_zero_plus2 orangepi_zero_plus)
   if [[ " ${sun50i[*]} " == *" $board "* ]]; then
     echo "Board: $board using sun50i_a64"
     cp /usr/share/arm-trusted-firmware/sun50i_a64/* builds/$(echo $board)/
   fi
-  sun50i=(orangepi_one_plus pine_h64)
-  if [[ " ${sun50i[*]} " == *" $board "* ]]; then
+  sun50h6=(orangepi_lite2 orangepi_one_plus pine_h64)
+  if [[ " ${sun50h6[*]} " == *" $board "* ]]; then
     echo "Board: $board using sun50i_h6"
     cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/
   fi
-  rk3399=(evb-rk3399 firefly-rk3399 rock960-rk3399)
+  rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 puma-rk3399 rock960-rk3399)
   if [[ " ${rk3399[*]} " == *" $board "* ]]; then
     echo "Board: $board using rk3399"
     cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
@@ -316,6 +316,10 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 
 %changelog
+* Wed Dec 12 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2019.01-0.2-rc1
+- ATF tweaks and fixes
+- Enable amarula_a64_relic, nanopi_a64, puma-rk3399
+
 * Tue Dec  4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2019.01-0.1-rc1
 - 2019.01 RC1
 - Enable new devices