Accepting request 617468 from hardware:boot

- Adopt %license
- Drop unused USE_PRIVATE_LIBGG=yes consistently
- Tidy RK3399 u-boot.itb handling
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches added:
  0013-rockchip-make_fit_atf.py-depends-on.patch
- Build u-boot.itb for {evb,firefly}-rk3399
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches added:
  0011-rockchip-make_fit_atf-use-elf-entry.patch
  0012-rockchip-make_fit_atf-make-python3-.patch
- Add dragonboard820c
- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
- Add p2771-0000-500 (Jetson TX2)

OBS-URL: https://build.opensuse.org/request/show/617468
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=99

0005-zynqmp-Add-generic-target.patch

@@ -38,8 +38,8 @@ v3 -> v4:
   - remove CONFIG_ZYNQ_SDHCI{0,1} - needs to be solved generically
   - add xhci usb1 to xhci controller list
 ---
- configs/xilinx_zynqmp_generic_defconfig | 86 +++++++++++++++++++++++++++++++++
- include/configs/xilinx_zynqmp_generic.h | 21 ++++++++
+ configs/xilinx_zynqmp_generic_defconfig | 86 +++++++++++++++++++++++++
+ include/configs/xilinx_zynqmp_generic.h | 21 ++++++
  2 files changed, 107 insertions(+)
  create mode 100644 configs/xilinx_zynqmp_generic_defconfig
  create mode 100644 include/configs/xilinx_zynqmp_generic.h

0006-tools-zynqmpimage-Add-partition-rea.patch

@@ -29,7 +29,7 @@ v3 -> v4:
 
   - fix checkpatch
 ---
- tools/zynqmpimage.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ tools/zynqmpimage.c | 175 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 173 insertions(+), 2 deletions(-)
 
 diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c

0007-tools-zynqmpimage-Move-defines-to-h.patch

@@ -9,8 +9,8 @@ one as well.
 
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- tools/zynqmpimage.c | 115 +--------------------------------------------
- tools/zynqmpimage.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tools/zynqmpimage.c | 115 +-------------------------------------
+ tools/zynqmpimage.h | 132 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 133 insertions(+), 114 deletions(-)
  create mode 100644 tools/zynqmpimage.h
 

0009-tools-zynqmpimage-Add-bif-support.patch

@@ -41,7 +41,7 @@ v3 -> v4:
  tools/Makefile      |    1 +
  tools/imagetool.h   |    1 +
  tools/mkimage.c     |    7 +
- tools/zynqmpbif.c   | 1008 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tools/zynqmpbif.c   | 1008 +++++++++++++++++++++++++++++++++++++++++++
  tools/zynqmpimage.c |    4 +-
  tools/zynqmpimage.h |    7 +
  8 files changed, 1028 insertions(+), 2 deletions(-)

0011-rockchip-make_fit_atf-use-elf-entry.patch

@@ -0,0 +1,72 @@
+From 938fc526f3d8ca5bd94ca3899edc0f1c5f190fec Mon Sep 17 00:00:00 2001
+From: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+Date: Wed, 16 May 2018 18:44:33 +0200
+Subject: [PATCH] rockchip: make_fit_atf: use elf entry point
+
+make_fit_atf.py uses physical address of first segment as the
+entry point to bl31. It is incorrect and causes following abort
+when bl31_entry() is called:
+
+U-Boot SPL board initTrying to boot from MMC1
+"Synchronous Abort" handler, esr 0x02000000
+elr: 0000000000000000 lr : 00000000ff8c7e8c
+x 0: 00000000ff8e0000 x 1: 0000000000000000
+x 2: 0000000000000000 x 3: 00000000ff8e0180
+x 4: 0000000000000000 x 5: 0000000000000000
+x 6: 0000000000000030 x 7: 00000000ff8e0188
+x 8: 00000000000001e0 x 9: 0000000000000000
+x10: 000000000007fcdc x11: 00000000002881b8
+x12: 00000000000001a2 x13: 0000000000000198
+x14: 000000000007fdcc x15: 00000000002881b8
+x16: 00000000003c0724 x17: 00000000003c0718
+x18: 000000000007fe80 x19: 00000000ff8e0000
+x20: 0000000000200000 x21: 00000000ff8e0000
+x22: 0000000000000000 x23: 000000000007fe30
+x24: 00000000ff8d1c3c x25: 00000000ff8d5000
+x26: 00000000deadbeef x27: 00000000000004a0
+x28: 000000000000009c x29: 000000000007fd90
+
+Fix it by using the entry point from the elf header.
+
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+---
+ arch/arm/mach-rockchip/make_fit_atf.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
+index 6b3d9201c9..b88a5e1f16 100755
+--- a/arch/arm/mach-rockchip/make_fit_atf.py
++++ b/arch/arm/mach-rockchip/make_fit_atf.py
+@@ -53,7 +53,7 @@ DT_END="""
+ };
+ """
+ 
+-def append_atf_node(file, atf_index, phy_addr):
++def append_atf_node(file, atf_index, phy_addr, elf_entry):
+     """
+     Append ATF DT node to input FIT dts file.
+     """
+@@ -67,7 +67,7 @@ def append_atf_node(file, atf_index, phy_addr):
+     print >> file, '\t\t\tcompression = "none";'
+     print >> file, '\t\t\tload = <0x%08x>;' % phy_addr
+     if atf_index == 1:
+-        print >> file, '\t\t\tentry = <0x%08x>;' % phy_addr
++        print >> file, '\t\t\tentry = <0x%08x>;' % elf_entry
+     print >> file, '\t\t};'
+     print >> file, ''
+ 
+@@ -141,12 +141,13 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi
+ 
+     with open(bl31_file_name) as bl31_file:
+         bl31 = ELFFile(bl31_file)
++        elf_entry = bl31.header['e_entry']
+         for i in range(bl31.num_segments()):
+             seg = bl31.get_segment(i)
+             if ('PT_LOAD' == seg.__getitem__(ELF_SEG_P_TYPE)):
+                 paddr = seg.__getitem__(ELF_SEG_P_PADDR)
+                 p= seg.__getitem__(ELF_SEG_P_PADDR)
+-                append_atf_node(fit_file, i+1, paddr)
++                append_atf_node(fit_file, i+1, paddr, elf_entry)
+     atf_cnt = i+1
+     append_fdt_node(fit_file, dtbs_file_name)
+     print >> fit_file, '%s' % DT_IMAGES_NODE_END

0012-rockchip-make_fit_atf-make-python3-.patch

@@ -0,0 +1,196 @@
+From c37bc4d88af6802cffd9c726f8521caf15842213 Mon Sep 17 00:00:00 2001
+From: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+Date: Mon, 21 May 2018 16:38:57 +0200
+Subject: [PATCH] rockchip: make_fit_atf: make python3 compatible
+
+Make script python3 compatible. No functional changes intended.
+
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+---
+ arch/arm/mach-rockchip/make_fit_atf.py | 89 +++++++++++++-------------
+ 1 file changed, 45 insertions(+), 44 deletions(-)
+
+diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
+index b88a5e1f16..d72a364ff1 100755
+--- a/arch/arm/mach-rockchip/make_fit_atf.py
++++ b/arch/arm/mach-rockchip/make_fit_atf.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python
+ """
+ A script to generate FIT image source for rockchip boards
+ with ARM Trusted Firmware
+@@ -43,6 +43,7 @@ DT_HEADER="""// SPDX-License-Identifier: GPL-2.0+ OR X11
+ 			compression = "none";
+ 			load = <0x%08x>;
+ 		};
++
+ """
+ 
+ DT_IMAGES_NODE_END="""
+@@ -58,18 +59,18 @@ def append_atf_node(file, atf_index, phy_addr, elf_entry):
+     Append ATF DT node to input FIT dts file.
+     """
+     data = 'bl31_0x%08x.bin' % phy_addr
+-    print >> file, '\t\tatf@%d {' % atf_index
+-    print >> file, '\t\t\tdescription = \"ARM Trusted Firmware\";'
+-    print >> file, '\t\t\tdata = /incbin/("%s");' % data
+-    print >> file, '\t\t\ttype = "firmware";'
+-    print >> file, '\t\t\tarch = "arm64";'
+-    print >> file, '\t\t\tos = "arm-trusted-firmware";'
+-    print >> file, '\t\t\tcompression = "none";'
+-    print >> file, '\t\t\tload = <0x%08x>;' % phy_addr
++    file.write('\t\tatf@%d {\n' % atf_index)
++    file.write('\t\t\tdescription = \"ARM Trusted Firmware\";\n')
++    file.write('\t\t\tdata = /incbin/("%s");\n' % data)
++    file.write('\t\t\ttype = "firmware";\n')
++    file.write('\t\t\tarch = "arm64";\n')
++    file.write('\t\t\tos = "arm-trusted-firmware";\n')
++    file.write('\t\t\tcompression = "none";\n')
++    file.write('\t\t\tload = <0x%08x>;\n' % phy_addr)
+     if atf_index == 1:
+-        print >> file, '\t\t\tentry = <0x%08x>;' % elf_entry
+-    print >> file, '\t\t};'
+-    print >> file, ''
++        file.write('\t\t\tentry = <0x%08x>;\n' % elf_entry)
++    file.write('\t\t};\n')
++    file.write('\n')
+ 
+ def append_fdt_node(file, dtbs):
+     """
+@@ -78,43 +79,43 @@ def append_fdt_node(file, dtbs):
+     cnt = 1
+     for dtb in dtbs:
+         dtname = os.path.basename(dtb)
+-        print >> file, '\t\tfdt@%d {' % cnt
+-        print >> file, '\t\t\tdescription = "%s";' % dtname
+-        print >> file, '\t\t\tdata = /incbin/("%s");' % dtb
+-        print >> file, '\t\t\ttype = "flat_dt";'
+-        print >> file, '\t\t\tcompression = "none";'
+-        print >> file, '\t\t};'
+-        print >> file, ''
++        file.write('\t\tfdt@%d {\n' % cnt)
++        file.write('\t\t\tdescription = "%s";\n' % dtname)
++        file.write('\t\t\tdata = /incbin/("%s");\n' % dtb)
++        file.write('\t\t\ttype = "flat_dt";\n')
++        file.write('\t\t\tcompression = "none";\n')
++        file.write('\t\t};\n')
++        file.write('\n')
+         cnt = cnt + 1
+ 
+ def append_conf_section(file, cnt, dtname, atf_cnt):
+-    print >> file, '\t\tconfig@%d {' % cnt
+-    print >> file, '\t\t\tdescription = "%s";' % dtname
+-    print >> file, '\t\t\tfirmware = "atf@1";'
+-    print >> file, '\t\t\tloadables = "uboot@1",',
++    file.write('\t\tconfig@%d {\n' % cnt)
++    file.write('\t\t\tdescription = "%s";\n' % dtname)
++    file.write('\t\t\tfirmware = "atf@1";\n')
++    file.write('\t\t\tloadables = "uboot@1",')
+     for i in range(1, atf_cnt):
+-        print >> file, '"atf@%d"' % (i+1),
++        file.write('"atf@%d"' % (i+1))
+         if i != (atf_cnt - 1):
+-            print >> file, ',',
++            file.write(',')
+         else:
+-            print >> file, ';'
+-    print >> file, '\t\t\tfdt = "fdt@1";'
+-    print >> file, '\t\t};'
+-    print >> file, ''
++            file.write(';\n')
++    file.write('\t\t\tfdt = "fdt@1";\n')
++    file.write('\t\t};\n')
++    file.write('\n')
+ 
+ def append_conf_node(file, dtbs, atf_cnt):
+     """
+     Append configeration nodes.
+     """
+     cnt = 1
+-    print >> file, '\tconfigurations {'
+-    print >> file, '\t\tdefault = "config@1";'
++    file.write('\tconfigurations {\n')
++    file.write('\t\tdefault = "config@1";\n')
+     for dtb in dtbs:
+         dtname = os.path.basename(dtb)
+         append_conf_section(file, cnt, dtname, atf_cnt)
+         cnt = cnt + 1
+-    print >> file, '\t};'
+-    print >> file, ''
++    file.write('\t};\n')
++    file.write('\n')
+ 
+ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_file_name):
+     """
+@@ -127,7 +128,7 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi
+ 
+     num_load_seg = 0
+     p_paddr = 0xFFFFFFFF
+-    with open(uboot_file_name) as uboot_file:
++    with open(uboot_file_name, 'rb') as uboot_file:
+         uboot = ELFFile(uboot_file)
+         for i in range(uboot.num_segments()):
+             seg = uboot.get_segment(i)
+@@ -137,9 +138,9 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi
+ 
+     assert (p_paddr != 0xFFFFFFFF and num_load_seg == 1)
+ 
+-    print >> fit_file, DT_HEADER % p_paddr
++    fit_file.write(DT_HEADER % p_paddr)
+ 
+-    with open(bl31_file_name) as bl31_file:
++    with open(bl31_file_name, 'rb') as bl31_file:
+         bl31 = ELFFile(bl31_file)
+         elf_entry = bl31.header['e_entry']
+         for i in range(bl31.num_segments()):
+@@ -150,15 +151,15 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi
+                 append_atf_node(fit_file, i+1, paddr, elf_entry)
+     atf_cnt = i+1
+     append_fdt_node(fit_file, dtbs_file_name)
+-    print >> fit_file, '%s' % DT_IMAGES_NODE_END
++    fit_file.write('%s\n' % DT_IMAGES_NODE_END)
+     append_conf_node(fit_file, dtbs_file_name, atf_cnt)
+-    print >> fit_file, '%s' % DT_END
++    fit_file.write('%s\n' % DT_END)
+ 
+     if fit_file_name != sys.stdout:
+         fit_file.close()
+ 
+ def generate_atf_binary(bl31_file_name):
+-    with open(bl31_file_name) as bl31_file:
++    with open(bl31_file_name, 'rb') as bl31_file:
+         bl31 = ELFFile(bl31_file)
+ 
+         num = bl31.num_segments()
+@@ -179,17 +180,17 @@ def get_bl31_segments_info(bl31_file_name):
+         bl31 = ELFFile(bl31_file)
+ 
+         num = bl31.num_segments()
+-        print 'Number of Segments : %d' % bl31.num_segments()
++        print('Number of Segments : %d' % bl31.num_segments())
+         for i in range(num):
+-            print 'Segment %d' % i
++            print('Segment %d' % i)
+             seg = bl31.get_segment(i)
+             ptype = seg[ELF_SEG_P_TYPE]
+             poffset = seg[ELF_SEG_P_OFFSET]
+             pmemsz = seg[ELF_SEG_P_MEMSZ]
+             pfilesz = seg[ELF_SEG_P_FILESZ]
+-            print 'type: %s\nfilesz: %08x\nmemsz: %08x\noffset: %08x' % (ptype, pfilesz, pmemsz, poffset)
++            print('type: %s\nfilesz: %08x\nmemsz: %08x\noffset: %08x' % (ptype, pfilesz, pmemsz, poffset))
+             paddr = seg[ELF_SEG_P_PADDR]
+-            print 'paddr: %08x' % paddr
++            print('paddr: %08x' % paddr)
+ 
+ def main():
+     uboot_elf="./u-boot"
+@@ -205,7 +206,7 @@ def main():
+         elif opt == "-b":
+             bl31_elf=val
+         elif opt == "-h":
+-            print __doc__
++            print(__doc__)
+             sys.exit(2)
+ 
+     dtbs = args

0013-rockchip-make_fit_atf.py-depends-on.patch

@@ -0,0 +1,35 @@
+From 5702e7e5cbc322a56f0b82daa86a57fc7477c53a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
+Date: Sun, 3 Jun 2018 05:47:38 +0200
+Subject: [PATCH] rockchip: make_fit_atf.py depends on u-boot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+u-boot.itb depends on u-boot-nodtb.bin, which in turn depends on u-boot.
+u-boot.its from Rockchip make_fit_atf.py (used by {evb,firefly}-rk3399)
+wants to read u-boot but is lacking this dependency, so that u-boot.itb
+cannot be built in one go. Detect its use and add the missing dependency.
+
+Reported-by: Yousaf Kaukab <yousaf.kaukab@suse.com>
+Signed-off-by: Andreas Färber <afaerber@suse.de>
+---
+ Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f31ee60e4c..3723346c4f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1051,7 +1051,10 @@ U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE))
+ else
+ ifneq ($(CONFIG_SPL_FIT_GENERATOR),"")
+ U_BOOT_ITS := u-boot.its
+-$(U_BOOT_ITS): FORCE
++ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py")
++U_BOOT_ITS_DEPS += u-boot
++endif
++$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE
+ 	$(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \
+ 	$(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@
+ endif

pre_checkin.sh

@@ -25,7 +25,7 @@ armv7_boards="$armv7_boards A10-OLinuXino-Lime A13-OLinuXino A13-OLinuXinoM"
 armv7_boards="$armv7_boards A20-OLinuXino-Lime A20-OLinuXino-Lime2 A20-OLinuXino_MICRO"
 armv7_boards="$armv7_boards nanopi_neo nanopi_neo_air orangepi_pc Hyundai_A7HD Lamobo_R1 Sinovoip_BPI_M2_Plus"
 # Broadcom
-armv7_boards="$armv7_boards rpi_2 rpi_3_32b"
+armv7_boards="$armv7_boards rpi_2"
 # Nvidia
 armv7_boards="$armv7_boards colibri_t20 paz00 jetson-tk1"
 # Rockchip
@@ -35,7 +35,7 @@ armv7_boards="$armv7_boards clearfog turris_omnia"
 # Altera
 armv7_boards="$armv7_boards socfpga_de0_nano_soc"
 
-aarch64_boards="dragonboard410c ls1012afrdm_qspi p2371-2180 rpi_3"
+aarch64_boards="ls1012afrdm_qspi rpi_3"
 # Allwinner
 aarch64_boards="$aarch64_boards nanopi_a64 orangepi_pc2 pine64_plus"
 # Amlogic
@@ -45,6 +45,10 @@ aarch64_boards="$aarch64_boards hikey poplar"
 # Marvell
 aarch64_boards="$aarch64_boards mvebu_db-88f3720 mvebu_espressobin-88f3720"
 aarch64_boards="$aarch64_boards mvebu_db_armada8k mvebu_mcbin-88f8040"
+# Nvidia
+aarch64_boards="$aarch64_boards p2371-2180 p2771-0000-500"
+# Qualcomm
+aarch64_boards="$aarch64_boards dragonboard410c dragonboard820c"
 # Rockchip
 aarch64_boards="$aarch64_boards geekbox"
 aarch64_boards="$aarch64_boards evb-rk3399 firefly-rk3399"
@@ -157,6 +161,12 @@ tinker-rk3288)
     ROCKCHIP_SPL_IMAGE_TYPES="rksd"
     ROCKCHIP_SPL_SOC=rk3288
     ;;
+evb-rk3399|firefly-rk3399)
+    BINEND=bin
+    ROCKCHIP_SPL=1
+    ROCKCHIP_SPL_IMAGE_TYPES="rksd"
+    ROCKCHIP_SPL_SOC=rk3399
+    ;;
 clearfog|turris_omnia)
     BINEND=img
     MVEBU_SPL=1

u-boot-a10-olinuxino-lime.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-a10-olinuxino-lime.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "a10-olinuxino-lime" == "rpi" || "a10-olinuxino-lime" == "rpi2" || "a10-olinuxino-lime" == "rpi332b" || "a10-olinuxino-lime" == "rpi3"
+%if "a10-olinuxino-lime" == "rpi" || "a10-olinuxino-lime" == "rpi2" || "a10-olinuxino-lime" == "rpi3"
 %define is_rpi 1
 %endif
+%if "a10-olinuxino-lime" == "evb-rk3399" || "a10-olinuxino-lime" == "firefly-rk3399" || "a10-olinuxino-lime" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A10-OLinuXino-Lime_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-a13-olinuxino.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-a13-olinuxino.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "a13-olinuxino" == "rpi" || "a13-olinuxino" == "rpi2" || "a13-olinuxino" == "rpi332b" || "a13-olinuxino" == "rpi3"
+%if "a13-olinuxino" == "rpi" || "a13-olinuxino" == "rpi2" || "a13-olinuxino" == "rpi3"
 %define is_rpi 1
 %endif
+%if "a13-olinuxino" == "evb-rk3399" || "a13-olinuxino" == "firefly-rk3399" || "a13-olinuxino" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A13-OLinuXino_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-a13-olinuxinom.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-a13-olinuxinom.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "a13-olinuxinom" == "rpi" || "a13-olinuxinom" == "rpi2" || "a13-olinuxinom" == "rpi332b" || "a13-olinuxinom" == "rpi3"
+%if "a13-olinuxinom" == "rpi" || "a13-olinuxinom" == "rpi2" || "a13-olinuxinom" == "rpi3"
 %define is_rpi 1
 %endif
+%if "a13-olinuxinom" == "evb-rk3399" || "a13-olinuxinom" == "firefly-rk3399" || "a13-olinuxinom" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A13-OLinuXinoM_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-a20-olinuxino-lime.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-a20-olinuxino-lime.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "a20-olinuxino-lime" == "rpi" || "a20-olinuxino-lime" == "rpi2" || "a20-olinuxino-lime" == "rpi332b" || "a20-olinuxino-lime" == "rpi3"
+%if "a20-olinuxino-lime" == "rpi" || "a20-olinuxino-lime" == "rpi2" || "a20-olinuxino-lime" == "rpi3"
 %define is_rpi 1
 %endif
+%if "a20-olinuxino-lime" == "evb-rk3399" || "a20-olinuxino-lime" == "firefly-rk3399" || "a20-olinuxino-lime" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-a20-olinuxino-lime2.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-a20-olinuxino-lime2.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "a20-olinuxino-lime2" == "rpi" || "a20-olinuxino-lime2" == "rpi2" || "a20-olinuxino-lime2" == "rpi332b" || "a20-olinuxino-lime2" == "rpi3"
+%if "a20-olinuxino-lime2" == "rpi" || "a20-olinuxino-lime2" == "rpi2" || "a20-olinuxino-lime2" == "rpi3"
 %define is_rpi 1
 %endif
+%if "a20-olinuxino-lime2" == "evb-rk3399" || "a20-olinuxino-lime2" == "firefly-rk3399" || "a20-olinuxino-lime2" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime2_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-a20-olinuxinomicro.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-a20-olinuxinomicro.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "a20-olinuxinomicro" == "rpi" || "a20-olinuxinomicro" == "rpi2" || "a20-olinuxinomicro" == "rpi332b" || "a20-olinuxinomicro" == "rpi3"
+%if "a20-olinuxinomicro" == "rpi" || "a20-olinuxinomicro" == "rpi2" || "a20-olinuxinomicro" == "rpi3"
 %define is_rpi 1
 %endif
+%if "a20-olinuxinomicro" == "evb-rk3399" || "a20-olinuxinomicro" == "firefly-rk3399" || "a20-olinuxinomicro" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino_MICRO_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-am335xboneblack.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-am335xboneblack.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "am335xboneblack" == "rpi" || "am335xboneblack" == "rpi2" || "am335xboneblack" == "rpi332b" || "am335xboneblack" == "rpi3"
+%if "am335xboneblack" == "rpi" || "am335xboneblack" == "rpi2" || "am335xboneblack" == "rpi3"
 %define is_rpi 1
 %endif
+%if "am335xboneblack" == "evb-rk3399" || "am335xboneblack" == "firefly-rk3399" || "am335xboneblack" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" am335x_boneblack_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-am335xevm.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-am335xevm.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "am335xevm" == "rpi" || "am335xevm" == "rpi2" || "am335xevm" == "rpi332b" || "am335xevm" == "rpi3"
+%if "am335xevm" == "rpi" || "am335xevm" == "rpi2" || "am335xevm" == "rpi3"
 %define is_rpi 1
 %endif
+%if "am335xevm" == "evb-rk3399" || "am335xevm" == "firefly-rk3399" || "am335xevm" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-am57xxevm.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-am57xxevm.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "am57xxevm" == "rpi" || "am57xxevm" == "rpi2" || "am57xxevm" == "rpi332b" || "am57xxevm" == "rpi3"
+%if "am57xxevm" == "rpi" || "am57xxevm" == "rpi2" || "am57xxevm" == "rpi3"
 %define is_rpi 1
 %endif
+%if "am57xxevm" == "evb-rk3399" || "am57xxevm" == "firefly-rk3399" || "am57xxevm" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" am57xx_evm_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-arndale.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-arndale.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "arndale" == "rpi" || "arndale" == "rpi2" || "arndale" == "rpi332b" || "arndale" == "rpi3"
+%if "arndale" == "rpi" || "arndale" == "rpi2" || "arndale" == "rpi3"
 %define is_rpi 1
 %endif
+%if "arndale" == "evb-rk3399" || "arndale" == "firefly-rk3399" || "arndale" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" arndale_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-bananapi.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-bananapi.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "bananapi" == "rpi" || "bananapi" == "rpi2" || "bananapi" == "rpi332b" || "bananapi" == "rpi3"
+%if "bananapi" == "rpi" || "bananapi" == "rpi2" || "bananapi" == "rpi3"
 %define is_rpi 1
 %endif
+%if "bananapi" == "evb-rk3399" || "bananapi" == "firefly-rk3399" || "bananapi" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Bananapi_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-board.spec.in

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl MVEBU_SPL
@@ -29,9 +30,12 @@
 %define imx6_spl IMX6_SPL
 %define socfpga_spl SOCFPGA_SPL
 
-%if "BOARDNAME" == "rpi" || "BOARDNAME" == "rpi2" || "BOARDNAME" == "rpi332b" || "BOARDNAME" == "rpi3"
+%if "BOARDNAME" == "rpi" || "BOARDNAME" == "rpi2" || "BOARDNAME" == "rpi3"
 %define is_rpi 1
 %endif
+%if "BOARDNAME" == "evb-rk3399" || "BOARDNAME" == "firefly-rk3399" || "BOARDNAME" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 ARCHIVE_VERSION
@@ -53,24 +57,35 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -104,10 +119,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -151,6 +177,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.BINEND
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -185,6 +214,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -195,14 +227,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.BINEND /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.BINEND /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-clearfog.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-clearfog.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 1
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "clearfog" == "rpi" || "clearfog" == "rpi2" || "clearfog" == "rpi332b" || "clearfog" == "rpi3"
+%if "clearfog" == "rpi" || "clearfog" == "rpi2" || "clearfog" == "rpi3"
 %define is_rpi 1
 %endif
+%if "clearfog" == "evb-rk3399" || "clearfog" == "firefly-rk3399" || "clearfog" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" clearfog_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-colibrit20.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-colibrit20.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "colibrit20" == "rpi" || "colibrit20" == "rpi2" || "colibrit20" == "rpi332b" || "colibrit20" == "rpi3"
+%if "colibrit20" == "rpi" || "colibrit20" == "rpi2" || "colibrit20" == "rpi3"
 %define is_rpi 1
 %endif
+%if "colibrit20" == "evb-rk3399" || "colibrit20" == "firefly-rk3399" || "colibrit20" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" colibri_t20_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-cubieboard.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-cubieboard.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "cubieboard" == "rpi" || "cubieboard" == "rpi2" || "cubieboard" == "rpi332b" || "cubieboard" == "rpi3"
+%if "cubieboard" == "rpi" || "cubieboard" == "rpi2" || "cubieboard" == "rpi3"
 %define is_rpi 1
 %endif
+%if "cubieboard" == "evb-rk3399" || "cubieboard" == "firefly-rk3399" || "cubieboard" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-cubieboard2.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-cubieboard2.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "cubieboard2" == "rpi" || "cubieboard2" == "rpi2" || "cubieboard2" == "rpi332b" || "cubieboard2" == "rpi3"
+%if "cubieboard2" == "rpi" || "cubieboard2" == "rpi2" || "cubieboard2" == "rpi3"
 %define is_rpi 1
 %endif
+%if "cubieboard2" == "evb-rk3399" || "cubieboard2" == "firefly-rk3399" || "cubieboard2" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-cubietruck.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-cubietruck.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "cubietruck" == "rpi" || "cubietruck" == "rpi2" || "cubietruck" == "rpi332b" || "cubietruck" == "rpi3"
+%if "cubietruck" == "rpi" || "cubietruck" == "rpi2" || "cubietruck" == "rpi3"
 %define is_rpi 1
 %endif
+%if "cubietruck" == "evb-rk3399" || "cubietruck" == "firefly-rk3399" || "cubietruck" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-dragonboard410c.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-dragonboard410c.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "dragonboard410c" == "rpi" || "dragonboard410c" == "rpi2" || "dragonboard410c" == "rpi332b" || "dragonboard410c" == "rpi3"
+%if "dragonboard410c" == "rpi" || "dragonboard410c" == "rpi2" || "dragonboard410c" == "rpi3"
 %define is_rpi 1
 %endif
+%if "dragonboard410c" == "evb-rk3399" || "dragonboard410c" == "firefly-rk3399" || "dragonboard410c" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" dragonboard410c_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-dragonboard820c.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-dragonboard820c.spec

@@ -0,0 +1,280 @@
+#
+# spec file for package u-boot-dragonboard820c
+#
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
+# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%bcond_with uboot_atf
+%bcond_with uboot_atf_pine64
+
+%define mvebu_spl 0
+%define x_loader 0
+%define rockchip_spl 0
+%define sunxi_spl 0
+%define arndale_spl 0
+%define origen_spl 0
+%define imx6_spl 0
+%define socfpga_spl 0
+
+%if "dragonboard820c" == "rpi" || "dragonboard820c" == "rpi2" || "dragonboard820c" == "rpi3"
+%define is_rpi 1
+%endif
+%if "dragonboard820c" == "evb-rk3399" || "dragonboard820c" == "firefly-rk3399" || "dragonboard820c" == "puma-rk3399"
+%define is_rk3399 1
+%endif
+
+# archive_version differs from version for RC version only
+%define archive_version 2018.05
+
+Name:           u-boot-dragonboard820c
+Version:        2018.05
+Release:        0
+Summary:        The U-Boot firmware for the dragonboard820c platform
+License:        GPL-2.0-only
+Group:          System/Boot
+Url:            http://www.denx.de/wiki/U-Boot
+Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
+Source1:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig
+Source2:        arndale-bl1.img
+Source3:        update_git.sh
+Source300:      u-boot-rpmlintrc
+Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
+Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
+BuildRequires:  arm-trusted-firmware-pine64
+%endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
+BuildRequires:  bc
+# Arndale board needs DTC >= 1.4
+BuildRequires:  dtc >= 1.4.0
+# u-boot-clearfog (tools/kwbimage.c) needs openssl to build
+BuildRequires:  libopenssl-devel
+BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
+BuildRequires:  swig
+%if "%{name}" == "u-boot-qemu-ppce500"
+# Owns /usr/share/qemu directory
+BuildRequires:  qemu
+Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
+%endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
+%if 0%{?is_rpi}
+# For mountpoint
+Requires(post): util-linux
+%endif
+Provides:       u-boot-loader
+Conflicts:      otherproviders(u-boot-loader)
+%if %x_loader == 1
+Obsoletes:      x-loader-dragonboard820c
+Provides:       x-loader-dragonboard820c
+%endif
+ExclusiveArch:  aarch64
+
+%description
+Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
+This package contains the firmware for the dragonboard820c platform.
+
+%package doc
+Summary:        Documentation for the U-Boot Firmware
+Group:          Documentation/Other
+
+%description doc
+Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
+This package contains documentation for U-Boot firmware.
+
+%prep
+%setup -q -n u-boot-%{archive_version}
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+%patch0007 -p1
+%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
+
+%build
+export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
+%if "%{name}" == "u-boot-pine64plus"
+export BL31=/boot/bl31.bin
+%endif
+
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" dragonboard820c_defconfig
+echo "Attempting to enable fdt apply command (.dtbo) support."
+echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
+
+%ifarch aarch64
+%if %sunxi_spl == 1
+cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
+%endif
+%endif
+
+%if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring"
+# Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format
+export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
+./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img
+%endif
+
+%if %rockchip_spl == 1
+for t in ; do
+    ./tools/mkimage -n  -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
+done
+%endif
+
+%install
+export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
+export NO_BRP_STRIP_DEBUG=true
+export NO_DEBUGINFO_STRIP_DEBUG=true
+%define uboot_dir /boot
+%if 0%{?is_rpi}
+%define uboot_dir /boot/vc
+%endif
+%if "%{name}" == "u-boot-qemu-ppce500"
+%define uboot_dir %{_datadir}/qemu
+%endif
+%if "%{name}" == "u-boot-jetson-tk1"
+# tegra-uboot-flasher needs several intermediate files, under their original name.
+for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do
+    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
+done
+%else
+%if "%{name}" == "u-boot-p2371-2180"
+# Jetson TX1 Driver Pack flash.sh needs several intermediate files, under their original name.
+for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
+    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
+done
+%else
+install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
+%if "%{name}" == "u-boot-qemu-ppce500"
+mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
+%endif
+%endif
+%endif
+%if %x_loader == 1
+install -D -m 0644 MLO %{buildroot}%{uboot_dir}/MLO
+%endif
+%if %origen_spl == 1
+install -D -m 0644 spl/origen-spl.bin %{buildroot}%{uboot_dir}/origen-spl.bin
+%endif
+%if %arndale_spl == 1
+install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin
+install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img
+%endif
+%if %mvebu_spl == 1
+install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
+%endif
+%if %rockchip_spl == 1
+install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
+for t in ; do
+    install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
+done
+%endif
+%if %sunxi_spl == 1
+install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin
+install -D -m 0644 u-boot-sunxi-with-spl.bin %{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin
+%endif
+%if %imx6_spl == 1
+install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
+%endif
+%if %socfpga_spl == 1
+install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
+%endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
+
+%if 0%{?is_rpi}
+%post
+# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt.
+# It needs to be on the first FAT partition, wherever we mounted it.
+# a) Unmounted, then do nothing.
+# b) Mounted as /boot/vc, then they're in the right place already.
+# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
+# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
+if mountpoint -q /boot/efi; then
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
+fi
+%endif
+
+%files
+%defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
+%{uboot_dir}/*
+
+%files doc
+%defattr(-,root,root)
+# Generic documents
+%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
+%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
+%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi
+%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
+%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST
+# Copy some useful kermit scripts as well
+%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image
+# Now any h/w dependent Documentation
+%doc doc/README.ARM-memory-map
+
+%changelog

u-boot-evb-rk3399.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-evb-rk3399.spec

@@ -18,20 +18,24 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
 %define x_loader 0
-%define rockchip_spl 0
+%define rockchip_spl 1
 %define sunxi_spl 0
 %define arndale_spl 0
 %define origen_spl 0
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "evb-rk3399" == "rpi" || "evb-rk3399" == "rpi2" || "evb-rk3399" == "rpi332b" || "evb-rk3399" == "rpi3"
+%if "evb-rk3399" == "rpi" || "evb-rk3399" == "rpi2" || "evb-rk3399" == "rpi3"
 %define is_rpi 1
 %endif
+%if "evb-rk3399" == "evb-rk3399" || "evb-rk3399" == "firefly-rk3399" || "evb-rk3399" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" evb-rk3399_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -140,8 +172,8 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
 %endif
 
 %if %rockchip_spl == 1
-for t in ; do
-    ./tools/mkimage -n  -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
+for t in rksd; do
+    ./tools/mkimage -n rk3399 -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
 done
 %endif
 
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -189,7 +224,7 @@ install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
 %endif
 %if %rockchip_spl == 1
 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
-for t in ; do
+for t in rksd; do
     install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
 done
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-firefly-rk3288.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-firefly-rk3288.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "firefly-rk3288" == "rpi" || "firefly-rk3288" == "rpi2" || "firefly-rk3288" == "rpi332b" || "firefly-rk3288" == "rpi3"
+%if "firefly-rk3288" == "rpi" || "firefly-rk3288" == "rpi2" || "firefly-rk3288" == "rpi3"
 %define is_rpi 1
 %endif
+%if "firefly-rk3288" == "evb-rk3399" || "firefly-rk3288" == "firefly-rk3399" || "firefly-rk3288" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" firefly-rk3288_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-firefly-rk3399.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-firefly-rk3399.spec

@@ -18,20 +18,24 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
 %define x_loader 0
-%define rockchip_spl 0
+%define rockchip_spl 1
 %define sunxi_spl 0
 %define arndale_spl 0
 %define origen_spl 0
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "firefly-rk3399" == "rpi" || "firefly-rk3399" == "rpi2" || "firefly-rk3399" == "rpi332b" || "firefly-rk3399" == "rpi3"
+%if "firefly-rk3399" == "rpi" || "firefly-rk3399" == "rpi2" || "firefly-rk3399" == "rpi3"
 %define is_rpi 1
 %endif
+%if "firefly-rk3399" == "evb-rk3399" || "firefly-rk3399" == "firefly-rk3399" || "firefly-rk3399" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" firefly-rk3399_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -140,8 +172,8 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
 %endif
 
 %if %rockchip_spl == 1
-for t in ; do
-    ./tools/mkimage -n  -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
+for t in rksd; do
+    ./tools/mkimage -n rk3399 -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
 done
 %endif
 
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -189,7 +224,7 @@ install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
 %endif
 %if %rockchip_spl == 1
 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
-for t in ; do
+for t in rksd; do
     install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
 done
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-geekbox.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-geekbox.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "geekbox" == "rpi" || "geekbox" == "rpi2" || "geekbox" == "rpi332b" || "geekbox" == "rpi3"
+%if "geekbox" == "rpi" || "geekbox" == "rpi2" || "geekbox" == "rpi3"
 %define is_rpi 1
 %endif
+%if "geekbox" == "evb-rk3399" || "geekbox" == "firefly-rk3399" || "geekbox" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" geekbox_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-highbank.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-highbank.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "highbank" == "rpi" || "highbank" == "rpi2" || "highbank" == "rpi332b" || "highbank" == "rpi3"
+%if "highbank" == "rpi" || "highbank" == "rpi2" || "highbank" == "rpi3"
 %define is_rpi 1
 %endif
+%if "highbank" == "evb-rk3399" || "highbank" == "firefly-rk3399" || "highbank" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" highbank_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-hikey.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-hikey.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "hikey" == "rpi" || "hikey" == "rpi2" || "hikey" == "rpi332b" || "hikey" == "rpi3"
+%if "hikey" == "rpi" || "hikey" == "rpi2" || "hikey" == "rpi3"
 %define is_rpi 1
 %endif
+%if "hikey" == "evb-rk3399" || "hikey" == "firefly-rk3399" || "hikey" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" hikey_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-hyundaia7hd.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-hyundaia7hd.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "hyundaia7hd" == "rpi" || "hyundaia7hd" == "rpi2" || "hyundaia7hd" == "rpi332b" || "hyundaia7hd" == "rpi3"
+%if "hyundaia7hd" == "rpi" || "hyundaia7hd" == "rpi2" || "hyundaia7hd" == "rpi3"
 %define is_rpi 1
 %endif
+%if "hyundaia7hd" == "evb-rk3399" || "hyundaia7hd" == "firefly-rk3399" || "hyundaia7hd" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Hyundai_A7HD_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-jetson-tk1.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-jetson-tk1.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "jetson-tk1" == "rpi" || "jetson-tk1" == "rpi2" || "jetson-tk1" == "rpi332b" || "jetson-tk1" == "rpi3"
+%if "jetson-tk1" == "rpi" || "jetson-tk1" == "rpi2" || "jetson-tk1" == "rpi3"
 %define is_rpi 1
 %endif
+%if "jetson-tk1" == "evb-rk3399" || "jetson-tk1" == "firefly-rk3399" || "jetson-tk1" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" jetson-tk1_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-lamobor1.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-lamobor1.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "lamobor1" == "rpi" || "lamobor1" == "rpi2" || "lamobor1" == "rpi332b" || "lamobor1" == "rpi3"
+%if "lamobor1" == "rpi" || "lamobor1" == "rpi2" || "lamobor1" == "rpi3"
 %define is_rpi 1
 %endif
+%if "lamobor1" == "evb-rk3399" || "lamobor1" == "firefly-rk3399" || "lamobor1" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Lamobo_R1_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-ls1012afrdmqspi.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-ls1012afrdmqspi.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "ls1012afrdmqspi" == "rpi" || "ls1012afrdmqspi" == "rpi2" || "ls1012afrdmqspi" == "rpi332b" || "ls1012afrdmqspi" == "rpi3"
+%if "ls1012afrdmqspi" == "rpi" || "ls1012afrdmqspi" == "rpi2" || "ls1012afrdmqspi" == "rpi3"
 %define is_rpi 1
 %endif
+%if "ls1012afrdmqspi" == "evb-rk3399" || "ls1012afrdmqspi" == "firefly-rk3399" || "ls1012afrdmqspi" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" ls1012afrdm_qspi_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-melea1000.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-melea1000.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "melea1000" == "rpi" || "melea1000" == "rpi2" || "melea1000" == "rpi332b" || "melea1000" == "rpi3"
+%if "melea1000" == "rpi" || "melea1000" == "rpi2" || "melea1000" == "rpi3"
 %define is_rpi 1
 %endif
+%if "melea1000" == "evb-rk3399" || "melea1000" == "firefly-rk3399" || "melea1000" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-merriia80optimus.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-merriia80optimus.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "merriia80optimus" == "rpi" || "merriia80optimus" == "rpi2" || "merriia80optimus" == "rpi332b" || "merriia80optimus" == "rpi3"
+%if "merriia80optimus" == "rpi" || "merriia80optimus" == "rpi2" || "merriia80optimus" == "rpi3"
 %define is_rpi 1
 %endif
+%if "merriia80optimus" == "evb-rk3399" || "merriia80optimus" == "firefly-rk3399" || "merriia80optimus" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Merrii_A80_Optimus_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mvebudb-88f3720.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mvebudb-88f3720.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "mvebudb-88f3720" == "rpi" || "mvebudb-88f3720" == "rpi2" || "mvebudb-88f3720" == "rpi332b" || "mvebudb-88f3720" == "rpi3"
+%if "mvebudb-88f3720" == "rpi" || "mvebudb-88f3720" == "rpi2" || "mvebudb-88f3720" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mvebudb-88f3720" == "evb-rk3399" || "mvebudb-88f3720" == "firefly-rk3399" || "mvebudb-88f3720" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_db-88f3720_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mvebudbarmada8k.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mvebudbarmada8k.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "mvebudbarmada8k" == "rpi" || "mvebudbarmada8k" == "rpi2" || "mvebudbarmada8k" == "rpi332b" || "mvebudbarmada8k" == "rpi3"
+%if "mvebudbarmada8k" == "rpi" || "mvebudbarmada8k" == "rpi2" || "mvebudbarmada8k" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mvebudbarmada8k" == "evb-rk3399" || "mvebudbarmada8k" == "firefly-rk3399" || "mvebudbarmada8k" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_db_armada8k_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mvebuespressobin-88f3720.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mvebuespressobin-88f3720.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "mvebuespressobin-88f3720" == "rpi" || "mvebuespressobin-88f3720" == "rpi2" || "mvebuespressobin-88f3720" == "rpi332b" || "mvebuespressobin-88f3720" == "rpi3"
+%if "mvebuespressobin-88f3720" == "rpi" || "mvebuespressobin-88f3720" == "rpi2" || "mvebuespressobin-88f3720" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mvebuespressobin-88f3720" == "evb-rk3399" || "mvebuespressobin-88f3720" == "firefly-rk3399" || "mvebuespressobin-88f3720" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_espressobin-88f3720_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mvebumcbin-88f8040.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mvebumcbin-88f8040.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "mvebumcbin-88f8040" == "rpi" || "mvebumcbin-88f8040" == "rpi2" || "mvebumcbin-88f8040" == "rpi332b" || "mvebumcbin-88f8040" == "rpi3"
+%if "mvebumcbin-88f8040" == "rpi" || "mvebumcbin-88f8040" == "rpi2" || "mvebumcbin-88f8040" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mvebumcbin-88f8040" == "evb-rk3399" || "mvebumcbin-88f8040" == "firefly-rk3399" || "mvebumcbin-88f8040" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_mcbin-88f8040_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mx53loco.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mx53loco.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "mx53loco" == "rpi" || "mx53loco" == "rpi2" || "mx53loco" == "rpi332b" || "mx53loco" == "rpi3"
+%if "mx53loco" == "rpi" || "mx53loco" == "rpi2" || "mx53loco" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mx53loco" == "evb-rk3399" || "mx53loco" == "firefly-rk3399" || "mx53loco" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.imx %{buildroot}%{uboot_dir}/u-boot.imx
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.imx %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.imx /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.imx /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mx6cuboxi.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mx6cuboxi.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 1
 %define socfpga_spl 0
 
-%if "mx6cuboxi" == "rpi" || "mx6cuboxi" == "rpi2" || "mx6cuboxi" == "rpi332b" || "mx6cuboxi" == "rpi3"
+%if "mx6cuboxi" == "rpi" || "mx6cuboxi" == "rpi2" || "mx6cuboxi" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mx6cuboxi" == "evb-rk3399" || "mx6cuboxi" == "firefly-rk3399" || "mx6cuboxi" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mx6cuboxi_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-mx6qsabrelite.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-mx6qsabrelite.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "mx6qsabrelite" == "rpi" || "mx6qsabrelite" == "rpi2" || "mx6qsabrelite" == "rpi332b" || "mx6qsabrelite" == "rpi3"
+%if "mx6qsabrelite" == "rpi" || "mx6qsabrelite" == "rpi2" || "mx6qsabrelite" == "rpi3"
 %define is_rpi 1
 %endif
+%if "mx6qsabrelite" == "evb-rk3399" || "mx6qsabrelite" == "firefly-rk3399" || "mx6qsabrelite" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.imx %{buildroot}%{uboot_dir}/u-boot.imx
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.imx %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.imx /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.imx /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-nanopia64.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-nanopia64.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "nanopia64" == "rpi" || "nanopia64" == "rpi2" || "nanopia64" == "rpi332b" || "nanopia64" == "rpi3"
+%if "nanopia64" == "rpi" || "nanopia64" == "rpi2" || "nanopia64" == "rpi3"
 %define is_rpi 1
 %endif
+%if "nanopia64" == "evb-rk3399" || "nanopia64" == "firefly-rk3399" || "nanopia64" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" nanopi_a64_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.itb %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.itb /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.itb /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-nanopineo.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-nanopineo.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "nanopineo" == "rpi" || "nanopineo" == "rpi2" || "nanopineo" == "rpi332b" || "nanopineo" == "rpi3"
+%if "nanopineo" == "rpi" || "nanopineo" == "rpi2" || "nanopineo" == "rpi3"
 %define is_rpi 1
 %endif
+%if "nanopineo" == "evb-rk3399" || "nanopineo" == "firefly-rk3399" || "nanopineo" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" nanopi_neo_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-nanopineoair.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-nanopineoair.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "nanopineoair" == "rpi" || "nanopineoair" == "rpi2" || "nanopineoair" == "rpi332b" || "nanopineoair" == "rpi3"
+%if "nanopineoair" == "rpi" || "nanopineoair" == "rpi2" || "nanopineoair" == "rpi3"
 %define is_rpi 1
 %endif
+%if "nanopineoair" == "evb-rk3399" || "nanopineoair" == "firefly-rk3399" || "nanopineoair" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" nanopi_neo_air_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-odroid-c2.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-odroid-c2.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "odroid-c2" == "rpi" || "odroid-c2" == "rpi2" || "odroid-c2" == "rpi332b" || "odroid-c2" == "rpi3"
+%if "odroid-c2" == "rpi" || "odroid-c2" == "rpi2" || "odroid-c2" == "rpi3"
 %define is_rpi 1
 %endif
+%if "odroid-c2" == "evb-rk3399" || "odroid-c2" == "firefly-rk3399" || "odroid-c2" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" odroid-c2_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-odroid-xu3.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-odroid-xu3.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "odroid-xu3" == "rpi" || "odroid-xu3" == "rpi2" || "odroid-xu3" == "rpi332b" || "odroid-xu3" == "rpi3"
+%if "odroid-xu3" == "rpi" || "odroid-xu3" == "rpi2" || "odroid-xu3" == "rpi3"
 %define is_rpi 1
 %endif
+%if "odroid-xu3" == "evb-rk3399" || "odroid-xu3" == "firefly-rk3399" || "odroid-xu3" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" odroid-xu3_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-odroid.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-odroid.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "odroid" == "rpi" || "odroid" == "rpi2" || "odroid" == "rpi332b" || "odroid" == "rpi3"
+%if "odroid" == "rpi" || "odroid" == "rpi2" || "odroid" == "rpi3"
 %define is_rpi 1
 %endif
+%if "odroid" == "evb-rk3399" || "odroid" == "firefly-rk3399" || "odroid" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" odroid_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.bin /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-omap3beagle.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-omap3beagle.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "omap3beagle" == "rpi" || "omap3beagle" == "rpi2" || "omap3beagle" == "rpi332b" || "omap3beagle" == "rpi3"
+%if "omap3beagle" == "rpi" || "omap3beagle" == "rpi2" || "omap3beagle" == "rpi3"
 %define is_rpi 1
 %endif
+%if "omap3beagle" == "evb-rk3399" || "omap3beagle" == "firefly-rk3399" || "omap3beagle" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-omap4panda.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de
 

u-boot-omap4panda.spec

@@ -18,6 +18,7 @@
 #
 
 
+%bcond_with uboot_atf
 %bcond_with uboot_atf_pine64
 
 %define mvebu_spl 0
@@ -29,9 +30,12 @@
 %define imx6_spl 0
 %define socfpga_spl 0
 
-%if "omap4panda" == "rpi" || "omap4panda" == "rpi2" || "omap4panda" == "rpi332b" || "omap4panda" == "rpi3"
+%if "omap4panda" == "rpi" || "omap4panda" == "rpi2" || "omap4panda" == "rpi3"
 %define is_rpi 1
 %endif
+%if "omap4panda" == "evb-rk3399" || "omap4panda" == "firefly-rk3399" || "omap4panda" == "puma-rk3399"
+%define is_rk3399 1
+%endif
 
 # archive_version differs from version for RC version only
 %define archive_version 2018.05
@@ -58,28 +62,42 @@ Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
 Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
 Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
 Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
+Patch0011:      0011-rockchip-make_fit_atf-use-elf-entry.patch
+Patch0012:      0012-rockchip-make_fit_atf-make-python3-.patch
+Patch0013:      0013-rockchip-make_fit_atf.py-depends-on.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
+%if 0%{?is_rk3399} && %{with uboot_atf}
+BuildRequires:  arm-trusted-firmware-rk3399
+%endif
 BuildRequires:  bc
 # Arndale board needs DTC >= 1.4
 BuildRequires:  dtc >= 1.4.0
 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-devel
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+# make_fit_atf.py
+BuildRequires:  python-pyelftools
+%endif
+%endif
 BuildRequires:  swig
 %if "%{name}" == "u-boot-qemu-ppce500"
 # Owns /usr/share/qemu directory
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if 0%{?is_rpi}
+# Owns /boot/vc directory
+BuildRequires:  raspberrypi-firmware
+%endif
 %if "%{name}" == "u-boot-zynqmp"
 BuildRequires:  zynqmp-dts
 %endif
 %if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
 # For mountpoint
 Requires(post): util-linux
 %endif
@@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware.
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
@@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes |
 export BL31=/boot/bl31.bin
 %endif
 
+%if %{with uboot_atf}
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399"
+cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf .
+%endif
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+     all u-boot.itb
+%else
+     all
+%endif
 
 %ifarch aarch64
 %if %sunxi_spl == 1
@@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
+%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
+%endif
 %if "%{name}" == "u-boot-qemu-ppce500"
 mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
 %endif
@@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
+%if "%{name}" == "u-boot-rpi3"
+echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post
@@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
 # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
 if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/
+  if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then
+    [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi
+    cp %{uboot_dir}/u-boot.img /boot/efi/
+  fi
 fi
 %endif
 
 %files
 %defattr(-,root,root)
+%license Licenses/gpl-2.0.txt
+%doc README
 %{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
 
 %files doc
 %defattr(-,root,root)

u-boot-orangepipc.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jun  2 16:45:39 UTC 2018 - afaerber@suse.de
+
+- Adopt %license
+- Drop unused USE_PRIVATE_LIBGG=yes consistently
+- Tidy RK3399 u-boot.itb handling
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0013-rockchip-make_fit_atf.py-depends-on.patch
+
+-------------------------------------------------------------------
+Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com
+
+- Build u-boot.itb for {evb,firefly}-rk3399
+- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
+* Patches added:
+  0011-rockchip-make_fit_atf-use-elf-entry.patch
+  0012-rockchip-make_fit_atf-make-python3-.patch
+
+-------------------------------------------------------------------
+Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de
+
+- Add dragonboard820c
+
+-------------------------------------------------------------------
+Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com
+
+- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control
+- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile
+
+-------------------------------------------------------------------
+Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de
+
+- Add p2771-0000-500 (Jetson TX2)
+
 -------------------------------------------------------------------
 Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de