Generate u-boot.img that contains all necessary binaries.

Change-Id: I8cba961d4fe009005c5ce123dc9148b4170eb763

diff --git a/packaging/arm-trusted-firmware.spec b/packaging/arm-trusted-firmware.spec
index 2a4b838..2301b7c 100644 (file)
--- a/packaging/arm-trusted-firmware.spec
+++ b/packaging/arm-trusted-firmware.spec
@@ -20,6 +20,8 @@ Source0: %{name}-%{version}.tar.bz2
 
 BuildRequires: git
 BuildRequires: optee-os
+BuildRequires: u-boot-rpi3
+BuildRequires: u-boot-tools
 
 Provides: optee.bin
 
@@ -42,13 +44,18 @@ cat bl31.head /boot/tee-pager.bin > optee.bin
 
 rm scratch bl31.tmp bl31.head
 
+cp /boot/spl/bcm2837-rpi-3-b.dtb .
+cp /boot/spl/fit_spl_atf.its .
+cp /boot/spl/u-boot-nodtb.bin .
+cp %{_bindir}/mkimage .
 
 %install
-mkdir -p %{buildroot}/boot/spl
-install -m 644 optee.bin %{buildroot}/boot/spl/
+mkimage -E -f  fit_spl_atf.its u-boot.img
+mkdir -p %{buildroot}/boot/
+install u-boot.img %{buildroot}/boot/
 
 %clean
 
 %files
 %defattr(-,root,root,-)
-/boot/*
+/boot/u-boot.img