up to 2.6

[packages/arm-trusted-firmware.git] / arm-trusted-firmware.spec

diff --git a/arm-trusted-firmware.spec b/arm-trusted-firmware.spec
index cde67e923077f9d72793c7f9f6aaca9fd5aa6e92..864c04c2bbe38d76dd4bc016c681e21643b7b9c3 100644 (file)
--- a/arm-trusted-firmware.spec
+++ b/arm-trusted-firmware.spec
@@ -1,12 +1,11 @@
 Summary:       ARM Trusted Firmware
 Name:          arm-trusted-firmware
-Version:       2.5
+Version:       2.6
 Release:       1
 License:       BSD
 Group:         Base/Kernel
 Source0:       https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-%{version}.tar.gz
-# Source0-md5: 590ae90bccde7ce8b7f5963b25500bfd
-Patch0:                rk3399-dram.patch
+# Source0-md5: 990073a9b7fde7bb0bc64186687aa779
 URL:           https://developer.arm.com/tools-and-software/open-source-software/firmware/trusted-firmware
 BuildRequires: crossarm-gcc
 BuildRequires: dtc
@@ -40,7 +39,6 @@ interest to users.
 
 %prep
 %setup -q -n trusted-firmware-a-%{version}
-%patch0 -p1
 
 %build
 for soc in rk3399; do
@@ -52,10 +50,15 @@ for soc in rk3399; do
        PLAT="$soc" \
        bl31
 done
+%{__make} -C tools/fiptool \
+       V=1 \
+       HOSTCC="%{__cc}" \
+       HOSTCCFLAGS="%{rpmcflags}" \
+       CPPFLAGS="%{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
 
 for soc in rk3399; do
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$soc
@@ -66,10 +69,13 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$soc
  done
 done
 
+cp -p tools/fiptool/fiptool $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -n arm-trusted-firmware-armv8
 %defattr(644,root,root,755)
 %doc readme.rst
+%attr(755,root,root) %{_bindir}/fiptool
 %{_datadir}/%{name}